chrome: Put browser_navigator.h into chrome namespace.

chrome/browser/ui/singleton_tabs.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/singleton_tabs.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 14 matching lines @@
     return true;
 
   GURL url_replaced = url.ReplaceComponents(replacements);
   GURL other_replaced = other.ReplaceComponents(replacements);
   return url_replaced == other_replaced;
 }
 
 }  // namespace
 
 void ShowSingletonTab(Browser* browser, const GURL& url) {
-  browser::NavigateParams params(GetSingletonTabNavigateParams(browser, url));
-  browser::Navigate(&params);
+  NavigateParams params(GetSingletonTabNavigateParams(browser, url));
+  Navigate(&params);
 }
 
 void ShowSingletonTabRespectRef(Browser* browser, const GURL& url) {
-  browser::NavigateParams params(GetSingletonTabNavigateParams(browser, url));
-  params.ref_behavior = browser::NavigateParams::RESPECT_REF;
-  browser::Navigate(&params);
+  NavigateParams params(GetSingletonTabNavigateParams(browser, url));
+  params.ref_behavior = NavigateParams::RESPECT_REF;
+  Navigate(&params);
 }
 
 void ShowSingletonTabOverwritingNTP(Browser* browser,
-                                    const browser::NavigateParams& params) {
-  browser::NavigateParams local_params(params);
-  content::WebContents* contents = chrome::GetActiveWebContents(browser);
+                                    const NavigateParams& params) {
+  NavigateParams local_params(params);
+  content::WebContents* contents = GetActiveWebContents(browser);
   if (contents) {
     const GURL& contents_url = contents->GetURL();
-    if ((contents_url == GURL(chrome::kChromeUINewTabURL) ||
-         contents_url == GURL(chrome::kAboutBlankURL)) &&
+    if ((contents_url == GURL(kChromeUINewTabURL) ||
+         contents_url == GURL(kAboutBlankURL)) &&
         GetIndexOfSingletonTab(&local_params) < 0) {
       local_params.disposition = CURRENT_TAB;
     }
   }
 
-  browser::Navigate(&local_params);
+  Navigate(&local_params);
 }
 
-browser::NavigateParams GetSingletonTabNavigateParams(Browser* browser,
-                                                      const GURL& url) {
-  browser::NavigateParams params(browser,
-                                 url,
-                                 content::PAGE_TRANSITION_AUTO_BOOKMARK);
+NavigateParams GetSingletonTabNavigateParams(Browser* browser,
+                                             const GURL& url) {
+  NavigateParams params(browser, url, content::PAGE_TRANSITION_AUTO_BOOKMARK);
   params.disposition = SINGLETON_TAB;
-  params.window_action = browser::NavigateParams::SHOW_WINDOW;
+  params.window_action = NavigateParams::SHOW_WINDOW;
   params.user_gesture = true;
   return params;
 }
 
 // Returns the index of an existing singleton tab in |params->browser| matching
 // the URL specified in |params|.
-int GetIndexOfSingletonTab(browser::NavigateParams* params) {
+int GetIndexOfSingletonTab(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;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url,
       params->browser->profile(),
       &reverse_on_redirect);
 
   // If there are several matches: prefer the active tab by starting there.
   int start_index = std::max(0, params->browser->active_index());
   int tab_count = params->browser->tab_count();
   for (int i = 0; i < tab_count; ++i) {
     int tab_index = (start_index + i) % tab_count;
-    TabContents* tab = chrome::GetTabContentsAt(params->browser, tab_index);
+    TabContents* tab = GetTabContentsAt(params->browser, tab_index);
 
     url_canon::Replacements<char> replacements;
-    if (params->ref_behavior == browser::NavigateParams::IGNORE_REF)
+    if (params->ref_behavior == NavigateParams::IGNORE_REF)
       replacements.ClearRef();
-    if (params->path_behavior == browser::NavigateParams::IGNORE_AND_NAVIGATE ||
-        params->path_behavior == browser::NavigateParams::IGNORE_AND_STAY_PUT) {
+    if (params->path_behavior == NavigateParams::IGNORE_AND_NAVIGATE ||
+        params->path_behavior == NavigateParams::IGNORE_AND_STAY_PUT) {
       replacements.ClearPath();
       replacements.ClearQuery();
     }
 
     if (CompareURLsWithReplacements(tab->web_contents()->GetURL(),
                                     params->url, replacements) ||
         CompareURLsWithReplacements(tab->web_contents()->GetURL(),
                                     rewritten_url, replacements)) {
       params->target_contents = tab;
       return tab_index;
     }
   }
 
   return -1;
 }
 
-
 }  // namespace chrome