commit 9a8e9352d12c519c70656ee70b643b67493f1993
author markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Aug 24 00:45:17 2012
committer markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Aug 24 00:45:17 2012
tree 8b685ba3f80d298fd4219e5e1f2a018dfdb08b57
parent fb4d9d1d2d0dc061167b93303f5fa50255843bf6

Enable the Website Settings UI by default on trunk.

BUG=106072


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

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

chrome/browser/ui/browser_commands.cc

diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 93c476b..be8f17a 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -641,11 +641,11 @@
   TabContents* tab_contents = TabContents::FromWebContents(web_contents);
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableWebsiteSettings)) {
+      switches::kDisableWebsiteSettings)) {
+    browser->window()->ShowPageInfo(web_contents, url, ssl, show_history);
+  } else {
     browser->window()->ShowWebsiteSettings(
         profile, tab_contents, url, ssl, show_history);
-  } else {
-    browser->window()->ShowPageInfo(web_contents, url, ssl, show_history);
   }
 }