diff options
author | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 00:35:02 +0000 |
---|---|---|
committer | miket@chromium.org <miket@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 00:35:02 +0000 |
commit | c164db57dbcf8374b4adc1ff6c39542e9fc5686b (patch) | |
tree | a9f21b7450f5c0e4219105a2d03c6732e0f4115a /chrome/common | |
parent | b34a31b09919c02f620efe9974ff02f919778f78 (diff) | |
download | chromium_src-c164db57dbcf8374b4adc1ff6c39542e9fc5686b.zip chromium_src-c164db57dbcf8374b4adc1ff6c39542e9fc5686b.tar.gz chromium_src-c164db57dbcf8374b4adc1ff6c39542e9fc5686b.tar.bz2 |
Reapply http://codereview.chromium.org/9214007/.
This landed, then blew up all the heapchecker/valgrind bots. Reverted,
then http://src.chromium.org/viewvc/chrome?view=rev&revision=119032
landed, which fixed the underlying problem.
BUG=94494
TEST=ran on Linux and Mac valgrind bots
Review URL: http://codereview.chromium.org/9289023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index c50a3b0..5399dab 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -503,9 +503,6 @@ const char kEnableExperimentalExtensionApis[] = const char kEnableExtensionActivityLogging[] = "enable-extension-activity-logging"; -// Enables extension alerts, which are currently in development. -const char kEnableExtensionAlerts[] = "enable-extension-alerts"; - // Enables experimental timeline API. const char kEnableExtensionTimelineApi[] = "enable-extension-timeline-api"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 4e0a667..a50073f 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -144,7 +144,6 @@ extern const char kEnableCrxlessWebApps[]; extern const char kEnableDevToolsExperiments[]; extern const char kEnableExperimentalExtensionApis[]; extern const char kEnableExtensionActivityLogging[]; -extern const char kEnableExtensionAlerts[]; extern const char kEnableExtensionTimelineApi[]; extern const char kEnableFastback[]; extern const char kEnableFileCookies[]; |