summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/common/chrome_switches.cc10
-rw-r--r--chrome/common/chrome_switches.h3
-rw-r--r--chromeos/chromeos_switches.cc3
-rw-r--r--chromeos/chromeos_switches.h1
-rw-r--r--content/shell/common/shell_switches.cc3
-rw-r--r--content/shell/common/shell_switches.h1
6 files changed, 0 insertions, 21 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index aabb2a4..dbcca27 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -111,9 +111,6 @@ const char kAppModeOAuth2Token[] = "app-mode-oauth-token";
// Whether to always use the new app install bubble when installing an app.
const char kAppsNewInstallBubble[] = "apps-new-install-bubble";
-// Disable throbber for extension apps.
-const char kAppsNoThrob[] = "apps-no-throb";
-
// Experimental native frame support for packaged apps.
const char kAppsUseNativeFrame[] = "apps-use-native-frame";
@@ -613,9 +610,6 @@ const char kEnableExtensionActivityLogging[] =
const char kEnableExtensionActivityLogTesting[] =
"enable-extension-activity-log-testing";
-// Enables or disables showing extensions in the action box.
-const char kExtensionsInActionBox[] = "extensions-in-action-box";
-
// Enable the fast unload controller, which speeds up tab/window close by
// running a tab's onunload js handler independently of the GUI -
// crbug.com/142458 .
@@ -1232,10 +1226,6 @@ const char kProxyServer[] = "proxy-server";
// NOTE: This is only implemented for Views.
const char kPurgeMemoryButton[] = "purge-memory-button";
-// Capture resource consumption information through page cycling and output the
-// data to the specified file.
-const char kRecordStats[] = "record-stats";
-
// Chrome supports a playback and record mode. Record mode saves *everything*
// to the cache. Playback mode reads data exclusively from the cache. This
// allows us to record a session into the cache and then replay it at will.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 065c5a9..bd3b30f 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -48,7 +48,6 @@ extern const char kAppsGalleryUpdateURL[];
extern const char kAppModeAuthCode[];
extern const char kAppModeOAuth2Token[];
extern const char kAppsNewInstallBubble[];
-extern const char kAppsNoThrob[];
extern const char kAppsUseNativeFrame[];
extern const char kAuthExtensionPath[];
extern const char kAuthNegotiateDelegateWhitelist[];
@@ -229,7 +228,6 @@ extern const char kEnableUnrestrictedSSL3Fallback[];
extern const char kEnableUserAlternateProtocolPorts[];
extern const char kEnableWatchdog[];
extern const char kEnableWebSocketOverSpdy[];
-extern const char kExtensionsInActionBox[];
extern const char kEventPageIdleTime[];
extern const char kEventPageSuspendingTime[];
extern const char kExplicitlyAllowedPorts[];
@@ -333,7 +331,6 @@ extern const char kProxyBypassList[];
extern const char kProxyPacUrl[];
extern const char kProxyServer[];
extern const char kPurgeMemoryButton[];
-extern const char kRecordStats[];
extern const char kRecordMode[];
extern const char kRemoteDebuggingFrontend[];
extern const char kRendererPrintPreview[];
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index ac9e8c1..fbfda49 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -80,9 +80,6 @@ const char kEnableBackgroundLoader[] = "enable-background-loader";
// Enables switching between different cellular carriers from the UI.
const char kEnableCarrierSwitching[] = "enable-carrier-switching";
-// Enable switching between audio devices in Chrome instead of cras.
-const char kEnableChromeAudioSwitching[] = "enable-chrome-audio-switching";
-
// Enables Chrome Captive Portal detector, which initiates Captive
// Portal detection for new active networks.
const char kEnableChromeCaptivePortalDetector[] =
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 6fe091c..6f03824 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -41,7 +41,6 @@ CHROMEOS_EXPORT extern const char kDisableStubEthernet[];
CHROMEOS_EXPORT extern const char kEchoExtensionPath[];
CHROMEOS_EXPORT extern const char kEnableBackgroundLoader[];
CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
-CHROMEOS_EXPORT extern const char kEnableChromeAudioSwitching[];
CHROMEOS_EXPORT extern const char kEnableChromeCaptivePortalDetector[];
CHROMEOS_EXPORT extern const char kEnableIMEModeIndicator[];
CHROMEOS_EXPORT extern const char kEnableKioskMode[];
diff --git a/content/shell/common/shell_switches.cc b/content/shell/common/shell_switches.cc
index 6c16104..dcd66a5 100644
--- a/content/shell/common/shell_switches.cc
+++ b/content/shell/common/shell_switches.cc
@@ -34,9 +34,6 @@ const char kEncodeBinary[] = "encode-binary";
// and debugging of layout tests that rely on it.
const char kExposeInternalsForTesting[] = "expose-internals-for-testing";
-// Save results when layout-as-browser tests fail.
-const char kOutputLayoutTestDifferences[] = "output-layout-test-differences";
-
// This makes us disable some web-platform runtime features so that we test
// content_shell as if it was a stable release. It is only followed when
// kDumpRenderTree is set. For the features' level, see
diff --git a/content/shell/common/shell_switches.h b/content/shell/common/shell_switches.h
index 7883548..72797f8 100644
--- a/content/shell/common/shell_switches.h
+++ b/content/shell/common/shell_switches.h
@@ -18,7 +18,6 @@ extern const char kDumpRenderTree[];
extern const char kEnableAccelerated2DCanvas[];
extern const char kEncodeBinary[];
extern const char kExposeInternalsForTesting[];
-extern const char kOutputLayoutTestDifferences[];
extern const char kStableReleaseMode[];
} // namespace switches