| Index: chrome/common/chrome_switches.h
|
| diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
|
| index 40f5551331653c5a8aa086f0e840f8ccf39ad66b..ea8fe5bd4b7e6181f1b559e0e46cb080f3253b3b 100644
|
| --- a/chrome/common/chrome_switches.h
|
| +++ b/chrome/common/chrome_switches.h
|
| @@ -148,15 +148,12 @@ extern const char kEnablePluginPlaceholderShadowDom[];
|
| extern const char kEnablePotentiallyAnnoyingSecurityFeatures[];
|
| extern const char kEnablePowerOverlay[];
|
| extern const char kEnablePrintPreviewRegisterPromos[];
|
| -extern const char kEnablePrivetStorage[];
|
| extern const char kEnableProfiling[];
|
| extern const char kEnableQueryExtraction[];
|
| extern const char kEnableQuic[];
|
| extern const char kEnableQuicPacing[];
|
| extern const char kEnableQuicPortSelection[];
|
| -extern const char kEnableReaderModeToolbarIcon[];
|
| extern const char kEnableSavePasswordBubble[];
|
| -extern const char kEnableSdchOverHttps[];
|
| extern const char kEnableSdchPersistence[];
|
| extern const char kEnableSessionCrashedBubble[];
|
| extern const char kEnableSettingsWindow[];
|
| @@ -168,7 +165,6 @@ extern const char kEnableSupervisedUserManagedBookmarksFolder[];
|
| extern const char kEnableSyncArticles[];
|
| extern const char kEnableTabAudioMuting[];
|
| extern const char kEnableThumbnailRetargeting[];
|
| -extern const char kEnableTranslateNewUX[];
|
| extern const char kEnableUserAlternateProtocolPorts[];
|
| extern const char kEnableWebAppFrame[];
|
| extern const char kEnableWebsiteSettingsManager[];
|
| @@ -189,9 +185,6 @@ extern const char kForceAppMode[];
|
| extern const char kForceFieldTrialParams[];
|
| extern const char kForceFirstRun[];
|
| extern const char kForceVariationIds[];
|
| -extern const char kHelp[];
|
| -extern const char kHelpShort[];
|
| -extern const char kHideIcons[];
|
| extern const char kHistoryEnableGroupByDomain[];
|
| extern const char kHomePage[];
|
| extern const char kHostRules[];
|
| @@ -204,7 +197,6 @@ extern const char kInstallSupervisedUserWhitelists[];
|
| extern const char kInstantProcess[];
|
| extern const char kInvalidationUseGCMChannel[];
|
| extern const char kIpcDumpDirectory[];
|
| -extern const char kIpcFuzzerTestcase[];
|
| extern const char kJavaScriptHarmony[];
|
| extern const char kKeepAliveForTest[];
|
| extern const char kKioskMode[];
|
| @@ -225,10 +217,8 @@ extern const char kMonitoringDestinationID[];
|
| extern const char kNetLogCaptureMode[];
|
| extern const char kNoDefaultBrowserCheck[];
|
| extern const char kNoDisplayingInsecureContent[];
|
| -extern const char kNoEvents[];
|
| extern const char kNoExperiments[];
|
| extern const char kNoFirstRun[];
|
| -extern const char kNoNetworkProfileWarning[];
|
| extern const char kNoProxyServer[];
|
| extern const char kNoPings[];
|
| extern const char kNoServiceAutorun[];
|
| @@ -245,7 +235,6 @@ extern const char kPermissionRequestApiScope[];
|
| extern const char kPermissionRequestApiUrl[];
|
| extern const char kPpapiFlashPath[];
|
| extern const char kPpapiFlashVersion[];
|
| -extern const char kPrefetchSearchResults[];
|
| extern const char kPrerenderFromOmnibox[];
|
| extern const char kPrerenderFromOmniboxSwitchValueAuto[];
|
| extern const char kPrerenderFromOmniboxSwitchValueDisabled[];
|
| @@ -276,9 +265,7 @@ extern const char kSbDisableExtensionBlacklist[];
|
| extern const char kServiceProcess[];
|
| extern const char kSilentDebuggerExtensionAPI[];
|
| extern const char kSilentLaunch[];
|
| -extern const char kSetToken[];
|
| extern const char kShowAppList[];
|
| -extern const char kShowIcons[];
|
| extern const char kShowSavedCopy[];
|
| extern const char kEnableShowSavedCopyPrimary[];
|
| extern const char kEnableShowSavedCopySecondary[];
|
| @@ -319,7 +306,6 @@ extern const char kSyncDisableRollback[];
|
| extern const char kTestName[];
|
| extern const char kTrustedSpdyProxy[];
|
| extern const char kTryChromeAgain[];
|
| -extern const char kUninstall[];
|
| extern const char kUnlimitedStorage[];
|
| extern const char kUnsafetyTreatInsecureOriginAsSecure[];
|
| extern const char kUseSimpleCacheBackend[];
|
| @@ -343,16 +329,20 @@ extern const char kDisableZeroSuggest[];
|
| extern const char kEnableAccessibilityTabSwitcher[];
|
| extern const char kEnableContextualSearch[];
|
| extern const char kEnableDomDistillerButtonAnimation[];
|
| +extern const char kEnableInstantSearchClicks[];
|
| +extern const char kEnableReaderModeToolbarIcon[];
|
| extern const char kEnableZeroSuggestMostVisited[];
|
| extern const char kEnableZeroSuggestMostVisitedWithoutSerp[];
|
| -extern const char kEnableInstantSearchClicks[];
|
| -#endif
|
| +extern const char kPrefetchSearchResults[];
|
| +#endif // defined(OS_ANDROID)
|
|
|
| #if defined(USE_ASH)
|
| extern const char kOpenAsh[];
|
| #endif
|
|
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
|
| +extern const char kHelp[];
|
| +extern const char kHelpShort[];
|
| extern const char kPasswordStore[];
|
| #endif
|
|
|
| @@ -365,19 +355,28 @@ extern const char kAppsKeepChromeAliveInTests[];
|
| extern const char kHostedAppQuitNotification[];
|
| extern const char kDisableHostedAppShimCreation[];
|
| extern const char kDisableSystemFullscreenForTesting[];
|
| -extern const char kRelauncherProcess[];
|
| +extern const char kEnableTranslateNewUX[];
|
| extern const char kMetricsClientID[];
|
| -#endif
|
| +extern const char kRelauncherProcess[];
|
| +#endif // defined(OS_MACOSX)
|
|
|
| #if defined(OS_WIN)
|
| extern const char kEnableCloudPrintXps[];
|
| extern const char kEnableProfileShortcutManager[];
|
| extern const char kForceDesktop[];
|
| extern const char kForceImmersive[];
|
| +extern const char kHideIcons[];
|
| +extern const char kNoNetworkProfileWarning[];
|
| extern const char kRelaunchShortcut[];
|
| +extern const char kShowIcons[];
|
| +extern const char kUninstall[];
|
| extern const char kViewerLaunchViaAppId[];
|
| extern const char kWaitForMutex[];
|
| extern const char kWindows8Search[];
|
| +#endif // defined(OS_WIN)
|
| +
|
| +#if defined(ENABLE_IPC_FUZZER)
|
| +extern const char kIpcFuzzerTestcase[];
|
| #endif
|
|
|
| #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
|
|
|