Separate Settings and Help from History and Extensions when settings-in-

chrome/browser/ui/chrome_pages.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/chrome_pages.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 90 matching lines @@
   }
   scoped_ptr<ScopedTabbedBrowserDisplayer> displayer;
   if (!browser) {
     displayer.reset(
         new ScopedTabbedBrowserDisplayer(profile, host_desktop_type));
     browser = displayer->browser();
   }
   ShowSingletonTab(browser, url);
 }
 
-bool SettingsWindowEnabled() {
+bool IsSettingsWindowEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       ::switches::kEnableSettingsWindow);
 }
 
 }  // namespace
 
 void ShowBookmarkManager(Browser* browser) {
   content::RecordAction(UserMetricsAction("ShowBookmarkManager"));
   content::RecordAction(UserMetricsAction("ShowBookmarks"));
   ShowSingletonTabOverwritingNTP(
       browser,
       GetSingletonTabNavigateParams(browser, GURL(kChromeUIBookmarksURL)));
 }
 
 void ShowBookmarkManagerForNode(Browser* browser, int64 node_id) {
   OpenBookmarkManagerWithHash(browser, std::string(), node_id);
 }
 
 void ShowHistory(Browser* browser) {
   content::RecordAction(UserMetricsAction("ShowHistory"));
-  if (SettingsWindowEnabled()) {
-    SettingsWindowManager::GetInstance()->ShowChromePageForProfile(
-        browser->profile(), GURL(kChromeUIHistoryURL));
-    return;
-  }
   NavigateParams params(
       GetSingletonTabNavigateParams(browser, GURL(kChromeUIHistoryURL)));
   params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
   ShowSingletonTabOverwritingNTP(browser, params);
 }
 
 void ShowDownloads(Browser* browser) {
   content::RecordAction(UserMetricsAction("ShowDownloads"));
   if (browser->window()) {
     DownloadShelf* shelf = browser->window()->GetDownloadShelf();
     // The downloads page is always shown in response to a user action.
     if (shelf->IsShowing())
       shelf->Close(DownloadShelf::USER_ACTION);
   }
   ShowSingletonTabOverwritingNTP(
       browser,
       GetSingletonTabNavigateParams(browser, GURL(kChromeUIDownloadsURL)));
 }
 
 void ShowExtensions(Browser* browser,
                     const std::string& extension_to_highlight) {
   content::RecordAction(UserMetricsAction("ShowExtensions"));
-  if (SettingsWindowEnabled()) {
-    SettingsWindowManager::GetInstance()->ShowChromePageForProfile(
-        browser->profile(), GURL(kChromeUIExtensionsURL));
-    return;
-  }
   NavigateParams params(
       GetSingletonTabNavigateParams(browser, GURL(kChromeUIExtensionsURL)));
   params.path_behavior = NavigateParams::IGNORE_AND_NAVIGATE;
   if (!extension_to_highlight.empty()) {
     GURL::Replacements replacements;
     std::string query("id=");
     query += extension_to_highlight;
     replacements.SetQueryStr(query);
     params.url = params.url.ReplaceComponents(replacements);
   }
@@ skipping 63 matching lines @@
     return false;
   GURL url(web_contents->GetURL());
   return url.SchemeIs(scheme.c_str());
 }
 
 void ShowSettings(Browser* browser) {
   ShowSettingsSubPage(browser, std::string());
 }
 
 void ShowSettingsSubPage(Browser* browser, const std::string& sub_page) {
-  if (SettingsWindowEnabled()) {
+  if (IsSettingsWindowEnabled()) {
     ShowSettingsSubPageForProfile(browser->profile(), sub_page);
     return;
   }
   ShowSettingsSubPageInTabbedBrowser(browser, sub_page);
 }
 
 void ShowSettingsSubPageForProfile(Profile* profile,
                                    const std::string& sub_page) {
-  if (SettingsWindowEnabled()) {
+  if (IsSettingsWindowEnabled()) {
     content::RecordAction(base::UserMetricsAction("ShowOptions"));
     SettingsWindowManager::GetInstance()->ShowChromePageForProfile(
         profile, GetSettingsUrl(sub_page));
     return;
   }
   Browser* browser =
       chrome::FindTabbedBrowser(profile, false, HOST_DESKTOP_TYPE_NATIVE);
   if (!browser) {
     browser = new Browser(
         Browser::CreateParams(profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
@@ skipping 65 matching lines @@
           original_profile, chrome::HOST_DESKTOP_TYPE_NATIVE));
       browser = displayer->browser();
     }
 
     NavigateToSingletonTab(browser, GURL(signin::GetPromoURL(source, false)));
     DCHECK_GT(browser->tab_strip_model()->count(), 0);
   }
 }
 
 }  // namespace chrome