Index: chrome/browser/extensions/error_console/error_console.cc |
diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc |
index 393f76f8e460dd8aa2d40cf7ed40f13e082c4f06..5da8940fe4441b9ce112c72fc8d96aa8ccf71417 100644 |
--- a/chrome/browser/extensions/error_console/error_console.cc |
+++ b/chrome/browser/extensions/error_console/error_console.cc |
@@ -169,9 +169,11 @@ void ErrorConsole::RemoveObserver(Observer* observer) { |
} |
bool ErrorConsole::IsEnabledForChromeExtensionsPage() const { |
+ FeatureSwitch* error_console = FeatureSwitch::error_console(); |
Devlin
2015/05/07 23:04:14
I think this boolean result is right, but it's har
Dan Beam
2015/05/07 23:08:44
+10
|
return profile_->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode) && |
- (FeatureSwitch::error_console()->IsEnabled() || |
- GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV); |
+ (error_console->IsEnabled() || |
+ GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV) && |
+ error_console->GetOverrideValue() != FeatureSwitch::OVERRIDE_DISABLED; |
} |
bool ErrorConsole::IsEnabledForAppsDeveloperTools() const { |