Enable settings in a window by default

chrome/browser/ui/webui/uber/uber_ui.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/webui/uber/uber_ui.h"
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 17 matching lines @@
 #include "grit/generated_resources.h"
 
 using base::ASCIIToUTF16;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::RenderViewHost;
 using content::WebContents;
 
 namespace {
 
-bool IsSettingsWindowEnabled() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      ::switches::kEnableSettingsWindow);
-}
-
 content::WebUIDataSource* CreateUberHTMLSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIUberHost);
 
   source->SetUseJsonJSFormatV2();
   source->SetJsonPath("strings.js");
   source->AddResourcePath("uber.js", IDR_UBER_JS);
   source->AddResourcePath("uber_utils.js", IDR_UBER_UTILS_JS);
   source->SetDefaultResource(IDR_UBER_HTML);
   source->OverrideContentSecurityPolicyFrameSrc("frame-src chrome:;");
@@ skipping 52 matching lines @@
   // TODO(jhawkins): Attempt to get rid of IDS_SHORT_PRODUCT_OS_NAME.
 #if defined(OS_CHROMEOS)
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_OS_NAME);
 #else
   source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
 #endif  // defined(OS_CHROMEOS)
 
   // Group settings and help separately if settings in a window is enabled.
   base::string16 settings_group(ASCIIToUTF16("settings_group"));
   base::string16 other_group(ASCIIToUTF16(
-      IsSettingsWindowEnabled() ? "other_group" : "settings_group"));
+      ::switches::SettingsWindowEnabled() ? "other_group" : "settings_group"));
   source->AddString("extensionsHost",
                     ASCIIToUTF16(chrome::kChromeUIExtensionsHost));
   source->AddLocalizedString("extensionsDisplayName",
                              IDS_MANAGE_EXTENSIONS_SETTING_WINDOWS_TITLE);
   source->AddString("extensionsGroup", other_group);
   source->AddString("helpHost",
                     ASCIIToUTF16(chrome::kChromeUIHelpHost));
   source->AddLocalizedString("helpDisplayName", IDS_ABOUT_TITLE);
   source->AddString("helpGroup", settings_group);
   source->AddString("historyHost",
@@ skipping 118 matching lines @@
       web_ui()->CallJavascriptFunction(
           "uber_frame.setNavigationOverride",
           base::StringValue(chrome::kChromeUIHistoryHost),
           base::StringValue(overrides_history ? "yes" : "no"));
       break;
     }
     default:
       NOTREACHED();
   }
 }