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..6cd8afba81138506fc22d078628a5c985f526984 100644 |
--- a/chrome/browser/extensions/error_console/error_console.cc |
+++ b/chrome/browser/extensions/error_console/error_console.cc |
@@ -169,9 +169,15 @@ void ErrorConsole::RemoveObserver(Observer* observer) { |
} |
bool ErrorConsole::IsEnabledForChromeExtensionsPage() const { |
- return profile_->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode) && |
- (FeatureSwitch::error_console()->IsEnabled() || |
- GetCurrentChannel() <= chrome::VersionInfo::CHANNEL_DEV); |
+ FeatureSwitch* error_console = FeatureSwitch::error_console(); |
Dan Beam
2015/05/12 01:34:13
put |error_console| as close as possible to its us
hcarmona
2015/05/12 17:20:13
Done.
|
+ |
+ if (!profile_->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode)) |
+ return false; // Only enabled in developer mode. |
+ if (GetCurrentChannel() > chrome::VersionInfo::CHANNEL_DEV && |
+ !error_console->IsEnabled()) |
+ return false; // Restricted to dev channel or opt-in. |
+ |
+ return true; |
} |
bool ErrorConsole::IsEnabledForAppsDeveloperTools() const { |