DOMUI: Use ShowSingletonTab to open the settings tab.

chrome/browser/ui/browser.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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 1019 matching lines @@
 bool Browser::NavigateToIndexWithDisposition(int index,
                                              WindowOpenDisposition disp) {
   NavigationController& controller =
       GetOrCloneTabForDisposition(disp)->controller();
   if (index < 0 || index >= controller.entry_count())
     return false;
   controller.GoToIndex(index);
   return true;
 }
 
-void Browser::ShowSingletonTab(const GURL& url) {
+void Browser::ShowSingletonTab(const GURL& url, bool ignore_path) {
   browser::NavigateParams params(this, url, PageTransition::AUTO_BOOKMARK);
   params.disposition = SINGLETON_TAB;
   params.show_window = true;
+  params.ignore_path = ignore_path;
   browser::Navigate(&params);
 }
 
 void Browser::UpdateCommandsForFullscreenMode(bool is_fullscreen) {
 #if !defined(OS_MACOSX)
   const bool show_main_ui = (type() == TYPE_NORMAL) && !is_fullscreen;
 #else
   const bool show_main_ui = (type() == TYPE_NORMAL);
 #endif
 
@@ skipping 660 matching lines @@
   ShowBookmarkManagerTab();
 }
 
 void Browser::ShowAppMenu() {
   UserMetrics::RecordAction(UserMetricsAction("ShowAppMenu"), profile_);
   window_->ShowAppMenu();
 }
 
 void Browser::ShowBookmarkManagerTab() {
   UserMetrics::RecordAction(UserMetricsAction("ShowBookmarks"), profile_);
-  ShowSingletonTab(GURL(chrome::kChromeUIBookmarksURL));
+  ShowSingletonTab(GURL(chrome::kChromeUIBookmarksURL), false);
 }
 
 void Browser::ShowHistoryTab() {
   UserMetrics::RecordAction(UserMetricsAction("ShowHistory"), profile_);
-  ShowSingletonTab(GURL(chrome::kChromeUIHistoryURL));
+  ShowSingletonTab(GURL(chrome::kChromeUIHistoryURL), false);
 }
 
 void Browser::ShowDownloadsTab() {
   UserMetrics::RecordAction(UserMetricsAction("ShowDownloads"), profile_);
-  ShowSingletonTab(GURL(chrome::kChromeUIDownloadsURL));
+  ShowSingletonTab(GURL(chrome::kChromeUIDownloadsURL), false);
 }
 
 void Browser::ShowExtensionsTab() {
   UserMetrics::RecordAction(UserMetricsAction("ShowExtensions"), profile_);
-  ShowSingletonTab(GURL(chrome::kChromeUIExtensionsURL));
+  ShowSingletonTab(GURL(chrome::kChromeUIExtensionsURL), false);
 }
 
 void Browser::ShowAboutConflictsTab() {
   UserMetrics::RecordAction(UserMetricsAction("AboutConflicts"), profile_);
-  ShowSingletonTab(GURL(chrome::kChromeUIConflictsURL));
+  ShowSingletonTab(GURL(chrome::kChromeUIConflictsURL), false);
 }
 
 void Browser::ShowBrokenPageTab(TabContents* contents) {
   UserMetrics::RecordAction(UserMetricsAction("ReportBug"), profile_);
   string16 page_title = contents->GetTitle();
   NavigationEntry* entry = contents->controller().GetActiveEntry();
   if (!entry)
     return;
   std::string page_url = entry->url().spec();
   std::vector<std::string> subst;
   subst.push_back(UTF16ToASCII(page_title));
   subst.push_back(page_url);
   std::string report_page_url =
       ReplaceStringPlaceholders(kBrokenPageUrl, subst, NULL);
-  ShowSingletonTab(GURL(report_page_url));
+  ShowSingletonTab(GURL(report_page_url), false);
 }
 
 void Browser::ShowOptionsTab(const std::string& sub_page) {
   GURL url(chrome::kChromeUISettingsURL + sub_page);
-
-  // See if there is already an options tab open that we can use.
-  TabStripModel* model = tab_handler_->GetTabStripModel();
-  for (int i = 0; i < model->count(); i++) {
-    TabContents* tc = model->GetTabContentsAt(i);
-    const GURL& tab_url = tc->GetURL();
-
-    if (tab_url.scheme() == url.scheme() && tab_url.host() == url.host()) {
-      // We found an existing options tab, load the URL in this tab.  (Note:
-      // this may cause us to unnecessarily reload the same page.  We can't
-      // really detect that unless the options page is permitted to change the
-      // URL in the address bar, but security policy doesn't allow that.
-      browser::NavigateParams params(this, url, PageTransition::GENERATED);
-      params.source_contents = tc;
-      browser::Navigate(&params);
-      model->SelectTabContentsAt(i, false);
-      return;
-    }
-  }
-
-  // No options tab found, so create a new one.
-  AddSelectedTabWithURL(url, PageTransition::AUTO_BOOKMARK);
+  ShowSingletonTab(url, true);
 }
 
 void Browser::OpenClearBrowsingDataDialog() {
   UserMetrics::RecordAction(UserMetricsAction("ClearBrowsingData_ShowDlg"),
                             profile_);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTabbedOptions)) {
     ShowOptionsTab(
         chrome::kAdvancedOptionsSubPage + std::string(kHashMark) +
         chrome::kClearBrowserDataSubPage);
@@ skipping 45 matching lines @@
 
 #if defined(ENABLE_REMOTING)
 void Browser::OpenRemotingSetupDialog() {
   RemotingSetupFlow::OpenDialog(profile_);
 }
 #endif
 
 void Browser::OpenAboutChromeDialog() {
   UserMetrics::RecordAction(UserMetricsAction("AboutChrome"), profile_);
 #if defined(OS_CHROMEOS)
-  ShowSingletonTab(GURL(chrome::kChromeUIAboutURL));
+  ShowSingletonTab(GURL(chrome::kChromeUIAboutURL), false);
 #else
   window_->ShowAboutChromeDialog();
 #endif
 }
 
 void Browser::OpenUpdateChromeDialog() {
   UserMetrics::RecordAction(UserMetricsAction("UpdateChrome"), profile_);
   window_->ShowUpdateChromeDialog();
 }
 
@@ skipping 2231 matching lines @@
   NOTREACHED();
   return false;
 }
 
 void Browser::CreateInstantIfNecessary() {
   if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
       !profile()->IsOffTheRecord()) {
     instant_.reset(new InstantController(profile_, this));
   }
 }