diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_service.cc | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 22a332d..b9685b7 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -438,13 +438,6 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kEnableVideoTrack) }, { - "extension-alerts", - IDS_FLAGS_ENABLE_EXTENSION_ALERTS_NAME, - IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION, - kOsAll, - SINGLE_VALUE_TYPE(switches::kEnableExtensionAlerts) - }, - { "enable-media-source", IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME, IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION, diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index a260db3..34a5dd1 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -1812,11 +1812,6 @@ void ExtensionService::OnAllExternalProvidersReady() { void ExtensionService::IdentifyAlertableExtensions() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableExtensionAlerts)) { - return; // TODO(miket): enable unconditionally when done. - } - // Build up the lists of extensions that require acknowledgment. // If this is the first time, grandfather extensions that would have // caused notification. |