Disable the Website Settings UI on Windows by default. It can be enabled by...

Disable the Website Settings UI on Windows by default. It can be enabled by using the flag --enable-website-settings


BUG=141062

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

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

chrome/browser/ui/browser_commands.cc

@@ -640,18 +640,8 @@ 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))
-    website_settings_enabled = true;
-#endif
-  if (website_settings_enabled) {
+      switches::kEnableWebsiteSettings)) {
     browser->window()->ShowWebsiteSettings(
         profile, tab_contents, url, ssl, show_history);
   } else {

chrome/common/chrome_switches.cc

@@ -1504,10 +1504,6 @@ const char kUseMockKeychain[]               = "use-mock-keychain";
 // modification or removal.
 const char kDisableDesktopShortcuts[]       = "disable-desktop-shortcuts";
 
-// Disables Website Settings. The Website Settings UI will replace the Page Info
-// Bubble.
-const char kDisableWebsiteSettings[]         = "disable-website-settings";
-
 // Enables sync credential caching on Windows 8.
 // See chrome/browser/sync/credential_cache_service_win.h.
 const char kEnableSyncCredentialCaching[]    = "enable-sync-credential-caching";

chrome/common/chrome_switches.h

@@ -421,7 +421,6 @@ extern const char kUseMockKeychain[];
 
 #if defined(OS_WIN)
 extern const char kDisableDesktopShortcuts[];
-extern const char kDisableWebsiteSettings[];
 extern const char kEnableSyncCredentialCaching[];
 extern const char kForceImmersive[];
 extern const char kRelaunchShortcut[];