Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 6ad2377..765a1c8 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -11,21 +11,26 @@
#include "build/build_config.h"
+#include "components/autofill/common/autofill_pref_names.h"
+
namespace prefs {
// Profile prefs. Please add Local State prefs below instead.
extern const char kDefaultApps[];
extern const char kDefaultAppsInstalled[];
+extern const char kDisableScreenshots[];
extern const char kHomePageIsNewTabPage[];
extern const char kHomePage[];
extern const char kHomePageChanged[];
-extern const char kIsGooglePlusUser[];
+extern const char kManagedModeLocalPassphrase[];
+extern const char kManagedModeLocalSalt[];
+extern const char kManagedModeManualHosts[];
+extern const char kManagedModeManualURLs[];
extern const char kSessionExitedCleanly[];
extern const char kSessionExitType[];
extern const char kRestoreOnStartup[];
extern const char kURLsToRestoreOnStartup[];
extern const char kRestoreOnStartupMigrated[];
-extern const char kDisableScreenshots[];
// For OS_CHROMEOS we maintain kApplicationLocale property in both local state
// and user's profile. Global property determines locale of login screen,
@@ -65,6 +70,7 @@
extern const char kAcceptLanguages[];
extern const char kStaticEncodings[];
extern const char kShowBookmarkBar[];
+extern const char kShowAppsShortcutInBookmarkBar[];
extern const char kBookmarkEditorExpandedNodes[];
extern const char kWebKitCommonScript[];
extern const char kWebKitStandardFontFamily[];
@@ -145,7 +151,6 @@
#endif
extern const char kPasswordManagerEnabled[];
extern const char kPasswordManagerAllowShowPasswords[];
-extern const char kPasswordGenerationEnabled[];
extern const char kAutologinEnabled[];
extern const char kReverseAutologinEnabled[];
extern const char kReverseAutologinRejectedEmailList[];
@@ -168,6 +173,7 @@
extern const char kDefaultSearchProviderID[];
extern const char kDefaultSearchProviderPrepopulateID[];
extern const char kDefaultSearchProviderAlternateURLs[];
+extern const char kDefaultSearchProviderSearchTermsReplacementKey[];
extern const char kSearchProviderOverrides[];
extern const char kSearchProviderOverridesVersion[];
extern const char kPromptForDownload[];
@@ -185,10 +191,12 @@
extern const char kUrlWhitelist[];
extern const char kInstantConfirmDialogShown[];
extern const char kInstantEnabled[];
+extern const char kInstantExtendedEnabled[];
extern const char kInstantUIZeroSuggestUrlPrefix[];
extern const char kMultipleProfilePrefMigration[];
extern const char kNetworkPredictionEnabled[];
extern const char kDefaultAppsInstallState[];
+extern const char kHideWebStoreIcon[];
#if defined(OS_CHROMEOS)
extern const char kAudioMute[];
extern const char kAudioVolumePercent[];
@@ -261,14 +269,17 @@
extern const char kLanguageRemapSearchKeyTo[];
extern const char kLanguageRemapControlKeyTo[];
extern const char kLanguageRemapAltKeyTo[];
+extern const char kLanguageRemapDiamondKeyTo[];
extern const char kLanguageXkbAutoRepeatEnabled[];
extern const char kLanguageXkbAutoRepeatDelay[];
extern const char kLanguageXkbAutoRepeatInterval[];
extern const char kSpokenFeedbackEnabled[];
extern const char kHighContrastEnabled[];
extern const char kScreenMagnifierEnabled[];
+extern const char kScreenMagnifierType[];
extern const char kScreenMagnifierScale[];
extern const char kVirtualKeyboardEnabled[];
+extern const char kShouldAlwaysShowAccessibilityMenu[];
extern const char kLabsAdvancedFilesystemEnabled[];
extern const char kLabsMediaplayerEnabled[];
extern const char kEnableScreenLock[];
@@ -276,14 +287,30 @@
extern const char kShow3gPromoNotification[];
extern const char kChromeOSReleaseNotesVersion[];
extern const char kUseSharedProxies[];
-extern const char kOAuth1Token[];
-extern const char kOAuth1Secret[];
extern const char kEnableCrosDRM[];
-extern const char kDisplayOverscans[];
+extern const char kDisplayProperties[];
extern const char kPrimaryDisplayID[];
extern const char kSecondaryDisplayLayout[];
extern const char kSecondaryDisplayOffset[];
extern const char kSecondaryDisplays[];
+extern const char kSessionStartTime[];
+extern const char kSessionLengthLimit[];
+extern const char kPowerAcScreenDimDelayMs[];
+extern const char kPowerAcScreenOffDelayMs[];
+extern const char kPowerAcScreenLockDelayMs[];
+extern const char kPowerAcIdleWarningDelayMs[];
+extern const char kPowerAcIdleDelayMs[];
+extern const char kPowerBatteryScreenDimDelayMs[];
+extern const char kPowerBatteryScreenOffDelayMs[];
+extern const char kPowerBatteryScreenLockDelayMs[];
+extern const char kPowerBatteryIdleWarningDelayMs[];
+extern const char kPowerBatteryIdleDelayMs[];
+extern const char kPowerIdleAction[];
+extern const char kPowerLidClosedAction[];
+extern const char kPowerUseAudioActivity[];
+extern const char kPowerUseVideoActivity[];
+extern const char kPowerPresentationIdleDelayFactor[];
+extern const char kTermsOfServiceURL[];
#endif // defined(OS_CHROMEOS)
extern const char kIpcDisabledMessages[];
extern const char kShowHomeButton[];
@@ -296,14 +323,16 @@
extern const char kDeleteFormData[];
extern const char kDeleteHostedAppsData[];
extern const char kDeauthorizeContentLicenses[];
-extern const char kEnableSpellCheck[];
+extern const char kEnableContinuousSpellcheck[];
extern const char kSpeechRecognitionFilterProfanities[];
extern const char kSpeechRecognitionTrayNotificationShownContexts[];
extern const char kEnabledLabsExperiments[];
extern const char kEnableAutoSpellCorrect[];
extern const char kSavingBrowserHistoryDisabled[];
+extern const char kAllowDeletingBrowserHistory[];
extern const char kForceSafeSearch[];
extern const char kDeleteTimePeriod[];
+extern const char kLastClearBrowsingDataTime[];
#if defined(TOOLKIT_GTK)
extern const char kUsesSystemTheme[];
#endif
@@ -325,6 +354,7 @@
extern const char kPluginsEnabledInternalPDF[];
extern const char kPluginsEnabledNaCl[];
extern const char kPluginsMigratedToPepperFlash[];
+extern const char kPluginsRemovedOldComponentPepperFlashSettings[];
extern const char kPluginsShowDetails[];
extern const char kPluginsAllowOutdated[];
extern const char kPluginsAlwaysAuthorize[];
@@ -342,14 +372,10 @@
#endif
extern const char kUseCustomChromeFrame[];
extern const char kShowOmniboxSearchHint[];
-extern const char kDesktopNotificationDefaultContentSetting[]; // OBSOLETE
-extern const char kDesktopNotificationAllowedOrigins[]; // OBSOLETE
-extern const char kDesktopNotificationDeniedOrigins[]; // OBSOLETE
extern const char kDesktopNotificationPosition[];
extern const char kDefaultContentSettings[];
extern const char kContentSettingsClearOnExitMigrated[];
extern const char kContentSettingsVersion[];
-extern const char kContentSettingsPatterns[]; // OBSOLETE
extern const char kContentSettingsPatternPairs[];
extern const char kContentSettingsDefaultWhitelistVersion[];
extern const char kContentSettingsPluginWhitelist[];
@@ -357,11 +383,7 @@
extern const char kClearSiteDataOnExit[];
extern const char kDefaultZoomLevel[];
extern const char kPerHostZoomLevels[];
-extern const char kAutofillEnabled[];
-extern const char kAutofillAuxiliaryProfilesEnabled[];
-extern const char kAutofillPositiveUploadRate[];
-extern const char kAutofillNegativeUploadRate[];
-extern const char kAutofillPersonalDataManagerFirstRun[];
+extern const char kAutofillDialogPayWithoutWallet[];
extern const char kEditBookmarksEnabled[];
extern const char kEnableTranslate[];
@@ -388,12 +410,17 @@
extern const char kProfileAvatarIndex[];
extern const char kProfileName[];
+extern const char kProfileIsManaged[];
extern const char kInvertNotificationShown[];
extern const char kPrintingEnabled[];
extern const char kPrintPreviewDisabled[];
+extern const char kDefaultManagedModeFilteringBehavior[];
+
+extern const char kMessageCenterDisabledExtensionIds[];
+
// Local state prefs. Please add Profile prefs above instead.
extern const char kCertRevocationCheckingEnabled[];
extern const char kSSLVersionMin[];
@@ -403,6 +430,10 @@
extern const char kDisableSSLRecordSplitting[];
extern const char kEnableMemoryInfo[];
+extern const char kGLVendorString[];
+extern const char kGLRendererString[];
+extern const char kGLVersionString[];
+
extern const char kMetricsClientID[];
extern const char kMetricsSessionID[];
extern const char kMetricsLowEntropySource[];
@@ -416,6 +447,8 @@
extern const char kBookmarkPromptEnabled[];
extern const char kBookmarkPromptImpressionCount[];
+extern const char kVariationsLastFetchTime[];
+extern const char kVariationsRestrictParameter[];
extern const char kVariationsSeed[];
extern const char kVariationsSeedDate[];
@@ -458,10 +491,9 @@
extern const char kStabilityPluginCrashes[];
extern const char kStabilityPluginLoadingErrors[];
+extern const char kInstallDate[];
extern const char kUninstallMetricsPageLoadCount[];
extern const char kUninstallLaunchCount[];
-
-extern const char kUninstallMetricsInstallDate[];
extern const char kUninstallMetricsUptimeSec[];
extern const char kUninstallLastLaunchTimeSec[];
extern const char kUninstallLastObservedRunTimeSec[];
@@ -500,8 +532,7 @@
extern const char kOptionsWindowLastTabIndex[];
extern const char kContentSettingsWindowLastTabIndex[];
extern const char kCertificateManagerWindowLastTabIndex[];
-extern const char kShouldShowFirstRunBubble[];
-extern const char kShouldShowWelcomePage[];
+extern const char kShowFirstRunBubbleOption[];
extern const char kLastKnownGoogleURL[];
extern const char kLastPromptedGoogleURL[];
@@ -518,13 +549,9 @@
extern const char kWasRestarted[];
#if defined(OS_WIN)
extern const char kRestartSwitchMode[];
+extern const char kRestartWithAppList[];
#endif
-extern const char kNumBookmarksOnBookmarkBar[];
-extern const char kNumFoldersOnBookmarkBar[];
-extern const char kNumBookmarksInOtherBookmarkFolder[];
-extern const char kNumFoldersInOtherBookmarkFolder[];
-
extern const char kNumKeywords[];
extern const char kDisableVideoAndChat[];
@@ -536,12 +563,14 @@
extern const char kLastExtensionsUpdateCheck[];
extern const char kNextExtensionsUpdateCheck[];
+extern const char kExtensionAlertsInitializedPref[];
extern const char kExtensionAllowedInstallSites[];
+extern const char kExtensionAllowedTypes[];
+extern const char kExtensionBlacklistUpdateVersion[];
extern const char kExtensionInstallAllowList[];
extern const char kExtensionInstallDenyList[];
-extern const char kExtensionAlertsInitializedPref[];
extern const char kExtensionInstallForceList[];
-extern const char kExtensionBlacklistUpdateVersion[];
+extern const char kExtensionStorageGarbageCollect[];
extern const char kNtpTipsResourceServer[];
@@ -558,16 +587,18 @@
extern const char kDevToolsDisabled[];
extern const char kDevToolsDockSide[];
extern const char kDevToolsEditedFiles[];
+extern const char kDevToolsFileSystemPaths[];
extern const char kDevToolsHSplitLocation[];
extern const char kDevToolsOpenDocked[];
#if defined(OS_ANDROID)
extern const char kDevToolsRemoteEnabled[];
#endif
extern const char kDevToolsVSplitLocation[];
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
// Used by Chrome Mobile.
-extern const char kSpdyProxyEnabled[];
-#endif
+extern const char kSpdyProxyAuthEnabled[];
+#endif // defined(OS_ANDROID) || defined(OS_IOS)
+extern const char kSigninAllowed[];
extern const char kSyncLastSyncedTime[];
extern const char kSyncHasSetupCompleted[];
extern const char kSyncKeepEverythingSynced[];
@@ -579,15 +610,20 @@
extern const char kSyncApps[];
extern const char kSyncAutofill[];
extern const char kSyncAutofillProfile[];
+extern const char kSyncFaviconImages[];
+extern const char kSyncFaviconTracking[];
extern const char kSyncThemes[];
extern const char kSyncTypedUrls[];
extern const char kSyncExtensions[];
extern const char kSyncExtensionSettings[];
extern const char kSyncHistoryDeleteDirectives[];
+extern const char kSyncDictionary[];
extern const char kSyncManaged[];
extern const char kSyncSearchEngines[];
extern const char kSyncSessions[];
extern const char kSyncSuppressStart[];
+extern const char kSyncSyncedNotifications[];
+extern const char kSyncTabs[];
extern const char kGoogleServicesLastUsername[];
extern const char kGoogleServicesUsername[];
extern const char kGoogleServicesUsernamePattern[];
@@ -599,6 +635,7 @@
extern const char kSyncMaxInvalidationVersions[];
extern const char kSyncSessionsGUID[];
+extern const char kInvalidatorClientId[];
extern const char kInvalidatorInvalidationState[];
extern const char kInvalidatorMaxInvalidationVersions[];
@@ -607,6 +644,7 @@
extern const char kSyncPromoUserSkipped[];
extern const char kSyncPromoShowOnFirstRunAllowed[];
extern const char kSyncPromoShowNTPBubble[];
+extern const char kSyncPromoErrorMessage[];
extern const char kProfileGAIAInfoUpdateTime[];
extern const char kProfileGAIAInfoPictureURL[];
@@ -616,12 +654,13 @@
extern const char kWebAppCreateInQuickLaunchBar[];
extern const char kGeolocationAccessToken[];
-extern const char kGeolocationDefaultContentSetting[];
-extern const char kGeolocationContentSettings[];
#if defined(OS_ANDROID)
extern const char kGeolocationEnabled[];
#endif
+extern const char kDefaultAudioCaptureDevice[];
+extern const char kDefaultVideoCaptureDevice[];
+
extern const char kRemoteAccessHostFirewallTraversal[];
extern const char kRemoteAccessHostRequireTwoFactor[];
extern const char kRemoteAccessHostDomain[];
@@ -682,6 +721,9 @@
extern const char kManagedNotificationsBlockedForUrls[];
extern const char kManagedAutoSelectCertificateForUrls[];
+extern const char kAudioCaptureAllowed[];
+extern const char kVideoCaptureAllowed[];
+
#if defined(OS_CHROMEOS)
extern const char kDeviceSettingsCache[];
extern const char kHardwareKeyboardLayout[];
@@ -694,9 +736,10 @@
extern const char kExternalStorageDisabled[];
extern const char kUsersWallpaperInfo[];
extern const char kAudioOutputAllowed[];
-extern const char kAudioCaptureAllowed[];
extern const char kOwnerPrimaryMouseButtonRight[];
extern const char kOwnerTapToClickEnabled[];
+extern const char kUptimeLimit[];
+extern const char kRebootAfterUpdate[];
#endif
extern const char kClearPluginLSODataEnabled[];
@@ -719,11 +762,18 @@
extern const char kAuthServerWhitelist[];
extern const char kAuthNegotiateDelegateWhitelist[];
extern const char kGSSAPILibraryName[];
-extern const char kSpdyProxyOrigin[];
+extern const char kSpdyProxyAuthOrigin[];
extern const char kAllowCrossOriginAuthPrompt[];
+extern const char kBuiltInDnsClientEnabled[];
+
extern const char kHttpReceivedContentLength[];
extern const char kHttpOriginalContentLength[];
+#if defined(OS_ANDROID) || defined(OS_IOS)
+extern const char kDailyHttpOriginalContentLength[];
+extern const char kDailyHttpReceivedContentLength[];
+extern const char kDailyHttpContentLengthLastUpdateDate[];
+#endif
extern const char kRegisteredProtocolHandlers[];
extern const char kIgnoredProtocolHandlers[];
@@ -732,32 +782,47 @@
extern const char kUserCreatedLoginItem[];
extern const char kUserRemovedLoginItem[];
extern const char kBackgroundModeEnabled[];
+extern const char kHardwareAccelerationModeEnabled[];
extern const char kDevicePolicyRefreshRate[];
extern const char kUserPolicyRefreshRate[];
-extern const char kLoadCloudPolicyOnSignin[];
+extern const char kDisableCloudPolicyOnSignin[];
extern const char kFactoryResetRequested[];
extern const char kRecoveryComponentVersion[];
extern const char kComponentUpdaterState[];
-#if defined(ENABLE_WEB_INTENTS)
-extern const char kWebIntentsEnabled[];
-#endif
-
extern const char kMediaGalleriesUniqueId[];
extern const char kMediaGalleriesRememberedGalleries[];
-#if defined(USE_AURA)
+#if defined(USE_ASH)
extern const char kShelfAlignment[];
extern const char kShelfAlignmentLocal[];
extern const char kShelfAutoHideBehavior[];
extern const char kShelfAutoHideBehaviorLocal[];
-extern const char kUseDefaultPinnedApps[];
extern const char kPinnedLauncherApps[];
extern const char kShowLogoutButtonInTray[];
+extern const char kShelfPreferences[];
+extern const char kWorkspaceCyclerShallowerThanSelectedYOffsets[];
+extern const char kWorkspaceCyclerDeeperThanSelectedYOffsets[];
+extern const char kWorkspaceCyclerSelectedYOffset[];
+extern const char kWorkspaceCyclerSelectedScale[];
+extern const char kWorkspaceCyclerMinScale[];
+extern const char kWorkspaceCyclerMaxScale[];
+extern const char kWorkspaceCyclerMinBrightness[];
+extern const char kWorkspaceCyclerBackgroundOpacity[];
+extern const char kWorkspaceCyclerDesktopWorkspaceBrightness[];
+extern const char kWorkspaceCyclerDistanceToInitiateCycling[];
+extern const char kWorkspaceCyclerScrollDistanceToCycleToNextWorkspace[];
+extern const char kWorkspaceCyclerCyclerStepAnimationDurationRatio[];
+extern const char kWorkspaceCyclerStartCyclerAnimationDuration[];
+extern const char kWorkspaceCyclerStopCyclerAnimationDuration[];
+#endif
+
+#if defined(USE_AURA)
+extern const char kFlingVelocityCap[];
extern const char kLongPressTimeInSeconds[];
extern const char kMaxDistanceBetweenTapsForDoubleTap[];
extern const char kMaxDistanceForTwoFingerTapInPixels[];
@@ -777,7 +842,24 @@
extern const char kRailBreakProportion[];
extern const char kRailStartProportion[];
extern const char kSemiLongPressTimeInSeconds[];
-extern const char kTouchScreenFlingAccelerationAdjustment[];
+extern const char kTabScrubActivationDelayInMS[];
+extern const char kFlingAccelerationCurveCoefficient0[];
+extern const char kFlingAccelerationCurveCoefficient1[];
+extern const char kFlingAccelerationCurveCoefficient2[];
+extern const char kFlingAccelerationCurveCoefficient3[];
+extern const char kFlingCurveTouchpadAlpha[];
+extern const char kFlingCurveTouchpadBeta[];
+extern const char kFlingCurveTouchpadGamma[];
+extern const char kFlingCurveTouchscreenAlpha[];
+extern const char kFlingCurveTouchscreenBeta[];
+extern const char kFlingCurveTouchscreenGamma[];
+extern const char kFlingMaxCancelToDownTimeInMs[];
+extern const char kFlingMaxTapGapTimeInMs[];
+extern const char kOverscrollHorizontalThresholdComplete[];
+extern const char kOverscrollVerticalThresholdComplete[];
+extern const char kOverscrollMinimumThresholdStart[];
+extern const char kOverscrollHorizontalResistThreshold[];
+extern const char kOverscrollVerticalResistThreshold[];
#endif
extern const char kInManagedMode[];
@@ -787,6 +869,13 @@
extern const char kLastPolicyStatisticsUpdate[];
+#if defined(OS_CHROMEOS)
+extern const char kRLZBrand[];
+extern const char kRLZDisabled[];
+#endif
+
+extern const char kAppListProfile[];
+
} // namespace prefs
#endif // CHROME_COMMON_PREF_NAMES_H_