DOMUI: Use ShowSingletonTab to open the settings tab.

chrome/browser/ui/browser_navigator.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_navigator.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/browser_window.h"
@@ skipping 35 matching lines @@
 
 // Finds an existing Browser compatible with |profile|, making a new one if no
 // such Browser is located.
 Browser* GetOrCreateBrowser(Profile* profile) {
   Browser* browser = BrowserList::FindBrowserWithType(profile,
                                                       Browser::TYPE_NORMAL,
                                                       false);
   return browser ? browser : Browser::Create(profile);
 }
 
-// Returns true if two URLs are equal ignoring their ref (hash fragment).
-bool CompareURLsIgnoreRef(const GURL& url, const GURL& other) {
+// Returns true if two URLs are equal after taking |replacements| into account.
+bool CompareURLsWithReplacements(
+    const GURL& url,
+    const GURL& other,
+    const url_canon::Replacements<char>& replacements) {
   if (url == other)
     return true;
-  // If neither has a ref than there is no point in stripping the refs and
-  // the URLs are different since the comparison failed in the previous if
-  // statement.
-  if (!url.has_ref() && !other.has_ref())
-    return false;
-  url_canon::Replacements<char> replacements;
-  replacements.ClearRef();
-  GURL url_no_ref = url.ReplaceComponents(replacements);
-  GURL other_no_ref = other.ReplaceComponents(replacements);
-  return url_no_ref == other_no_ref;
+
+  GURL url_replaced = url.ReplaceComponents(replacements);
+  GURL other_replaced = other.ReplaceComponents(replacements);
+  return url_replaced == other_replaced;
 }
 
 // Returns the index of an existing singleton tab in |params->browser| matching
 // the URL specified in |params|.
 int GetIndexOfSingletonTab(browser::NavigateParams* params) {
   if (params->disposition != SINGLETON_TAB)
     return -1;
 
   // In case the URL was rewritten by the BrowserURLHandler we need to ensure
   // that we do not open another URL that will get redirected to the rewritten
   // URL.
   GURL rewritten_url(params->url);
   bool reverse_on_redirect = false;
   BrowserURLHandler::RewriteURLIfNecessary(&rewritten_url,
                                            params->browser->profile(),
                                            &reverse_on_redirect);
 
   for (int i = 0; i < params->browser->tab_count(); ++i) {
     TabContents* tab = params->browser->GetTabContentsAt(i);
-    if (CompareURLsIgnoreRef(tab->GetURL(), params->url) ||
-        CompareURLsIgnoreRef(tab->GetURL(), rewritten_url)) {
+
+    url_canon::Replacements<char> replacements;
+    replacements.ClearRef();
+    if (params->ignore_path)
+      replacements.ClearPath();
+
+    if (CompareURLsWithReplacements(tab->GetURL(), params->url, replacements) ||
+        CompareURLsWithReplacements(tab->GetURL(), rewritten_url,
+                                    replacements)) {
       params->target_contents = tab;
       return i;
     }
   }
+
   return -1;
 }
 
 // Change some of the navigation parameters based on the particular URL.
 // Currently this applies to chrome://settings and the bookmark manager,
 // which we always want to open in a normal (not incognito) window.
 void AdjustNavigateParamsForURL(browser::NavigateParams* params) {
   if (!params->target_contents &&
       params->url.scheme() == chrome::kChromeUIScheme &&
       (params->url.host() == chrome::kChromeUISettingsHost ||
@@ skipping 271 matching lines @@
 
   if (params->source_contents == params->target_contents) {
     // The navigation occurred in the source tab, so update the UI.
     params->browser->UpdateUIForNavigationInTab(params->target_contents,
                                                 params->transition,
                                                 user_initiated);
   } else {
     // The navigation occurred in some other tab.
     int singleton_index = GetIndexOfSingletonTab(params);
     if (params->disposition == SINGLETON_TAB && singleton_index >= 0) {
+      TabContents* target = params->browser->GetTabContentsAt(singleton_index);
+
+      // Load the URL if the target contents URL doesn't match. This can happen
+      // if the URL path is ignored when locating the singleton tab.
+      if (target->GetURL() != params->url) {
+        target->controller().LoadURL(
+            params->url, params->referrer, params->transition);
+      }
+
       // The navigation should re-select an existing tab in the target Browser.
       params->browser->SelectTabContentsAt(singleton_index, user_initiated);
     } else {
       // If some non-default value is set for the index, we should tell the
       // TabStripModel to respect it.
       if (params->tabstrip_index != -1)
         params->tabstrip_add_types |= TabStripModel::ADD_FORCE_INDEX;
 
       // The navigation should insert a new tab into the target Browser.
       params->browser->tabstrip_model()->AddTabContents(
           params->target_contents,
           params->tabstrip_index,
           params->transition,
           params->tabstrip_add_types);
       // Now that the |params->target_contents| is safely owned by the target
       // Browser's TabStripModel, we can release ownership.
       target_contents_owner.ReleaseOwnership();
     }
   }
 }
 
 }  // namespace browser