Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2075)

Unified Diff: chrome/browser/extensions/error_console/error_console.cc

Issue 1132493004: Enable extensions error button test that was failing on stable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Apply Feedback Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/extensions/extension_settings_browsertest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « no previous file | chrome/browser/ui/webui/extensions/extension_settings_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698