Enable the Website Setting UI by default on Windows

BUG=106072
TEST=none


Review URL: https://chromiumcodereview.appspot.com/10823002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148502 0039d316-1c4b-4281-b951-d872f2087c98

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 {

chrome/common/chrome_switches.cc

@@ -1490,6 +1490,10 @@ const char kUseMockKeychain[]               = "use-mock-keychain";
 // Disables profile desktop shortcuts handling, preventing their creation,
 // modification or removal.
 const char kDisableDesktopShortcuts[]       = "disable-desktop-shortcuts";
+
+// Enable Website Settings. The Website Settings UI will replace the Page Info
+// Bubble.
+const char kDisableWebsiteSettings[]         = "disable-website-settings";
 #endif
 
 #if defined(USE_AURA)

chrome/common/chrome_switches.h

@@ -417,6 +417,7 @@ extern const char kUseMockKeychain[];
 
 #if defined(OS_WIN)
 extern const char kDisableDesktopShortcuts[];
+extern const char kDisableWebsiteSettings[];
 #endif
 
 #if defined(USE_AURA)