Flags: Enable Tabbed Options by default.

chrome/browser/dom_ui/dom_ui_factory.cc

 // Copyright (c) 2010 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/dom_ui/dom_ui_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/dom_ui/bookmarks_ui.h"
 #include "chrome/browser/dom_ui/bug_report_ui.h"
@@ skipping 182 matching lines @@
   if (url.host() == chrome::kChromeUISystemInfoHost)
     return &NewDOMUI<SystemInfoUI>;
   if (url.host() == chrome::kChromeUIMenu)
     return &NewDOMUI<chromeos::MenuUI>;
   if (url.host() == chrome::kChromeUIWrenchMenu)
     return &NewDOMUI<chromeos::WrenchMenuUI>;
   if (url.host() == chrome::kChromeUINetworkMenu)
     return &NewDOMUI<chromeos::NetworkMenuUI>;
 #else
   if (url.host() == chrome::kChromeUISettingsHost) {
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableTabbedOptions)) {
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kDisableTabbedOptions)) {
       return &NewDOMUI<OptionsUI>;
     }
   }
   if (url.host() == chrome::kChromeUIPrintHost) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnablePrintPreview)) {
       return &NewDOMUI<PrintPreviewUI>;
     }
   }
 #endif  // defined(OS_CHROMEOS)
@@ skipping 114 matching lines @@
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 
 #if defined(ENABLE_REMOTING)
   if (page_url.host() == chrome::kChromeUIRemotingHost)
     return RemotingUI::GetFaviconResourceBytes();
 #endif
 
   return NULL;
 }