Enable the Website Settings UI by default on trunk.

chrome/browser/ui/browser_commands.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 623 matching lines @@
 void ShowPageInfo(Browser* browser,
                   content::WebContents* web_contents,
                   const GURL& url,
                   const SSLStatus& ssl,
                   bool show_history) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents->GetBrowserContext());
   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);
   }
 }
 
 void ShowChromeToMobileBubble(Browser* browser) {
   // Only show the bubble if the window is active, otherwise we may get into
   // weird situations where the bubble is deleted as soon as it is shown.
   if (browser->window()->IsActive())
     browser->window()->ShowChromeToMobileBubble();
 }
 
@@ skipping 323 matching lines @@
   if (!tab_contents)
     tab_contents = new TabContents(contents);
   app_browser->tab_strip_model()->AppendTabContents(tab_contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 
 }  // namespace chrome