DOMUI: Use ShowSingletonTab to open the settings tab.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 1089e42020db2b3ef24ca3c2ad4e86152908494d..afa17524ad5c2aa050503585ef7d68e6c7f81d51 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1761,28 +1761,11 @@ void Browser::ShowBrokenPageTab(TabContents* contents) {
 
 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);
+  browser::NavigateParams params(this, url, PageTransition::AUTO_BOOKMARK);
+  params.disposition = SINGLETON_TAB;
+  params.show_window = true;
+  params.ignore_path = true;
+  browser::Navigate(&params);

[Ben Goodger (Google), 2010/11/17 00:20:45]

How about changing Browser::ShowSingletonTab() to take ignore_path as a
parameter and just calling that with |url|?

[James Hawkins, 2010/11/17 00:31:16]

Done.

 }
 
 void Browser::OpenClearBrowsingDataDialog() {