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

Unified Diff: chrome/browser/ui/browser_commands.cc

Issue 10823002: Enable the Website Setting UI by default on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Enable the Website Settings by default on windows. Created 8 years, 5 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/common/chrome_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_commands.cc
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 14c1957a533061531b962ea5297480f81542a552..041cd8b4865fd8ed0dcd233377b3d141581d1c13 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -637,8 +637,18 @@ void ShowPageInfo(Browser* browser,
web_contents->GetBrowserContext());
TabContents* tab_contents = TabContents::FromWebContents(web_contents);
+#if defined(OS_WIN)
+ bool website_settings_enabled = true;
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableWebsiteSettings))
+ website_settings_enabled = false;
+#else
+ bool website_settings_enabled = false;
if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableWebsiteSettings)) {
+ switches::kEnableWebsiteSettings))
+ website_settings_enabled = true;
+#endif
+ if (website_settings_enabled) {
browser->window()->ShowWebsiteSettings(
profile, tab_contents, url, ssl, show_history);
} else {
« no previous file with comments | « no previous file | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698