browser: Move FindOrCreateTabbedBrowser() function into chrome namespace.

BUG=133088
TBR=ben@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11660032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174638 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 41 insertions, 43 deletions

diff --git a/chrome/browser/chromeos/dbus/printer_service_provider.cc b/chrome/browser/chromeos/dbus/printer_service_provider.cc
index ecb54554..ee048d6 100644
--- a/chrome/browser/chromeos/dbus/printer_service_provider.cc
+++ b/chrome/browser/chromeos/dbus/printer_service_provider.cc
@@ -74,8 +74,8 @@ void FindOrOpenCloudPrintPage(const std::string& vendor,
 
   Browser* browser = ActivateAndGetBrowserForUrl(url);
   if (!browser) {
-    browser = browser::FindOrCreateTabbedBrowser(profile,
-                                                 chrome::HOST_DESKTOP_TYPE_ASH);
+    browser = chrome::FindOrCreateTabbedBrowser(profile,
+                                                chrome::HOST_DESKTOP_TYPE_ASH);
     if (!browser)
       return;
     UMA_HISTOGRAM_ENUMERATION("PrinterService.PrinterServiceEvent",
diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc
index 386d896..ae19b55 100644
--- a/chrome/browser/chromeos/extensions/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_handler_util.cc
@@ -655,7 +655,7 @@ bool FileTaskExecutor::Execute(const std::vector<GURL>& file_urls) {
 // TODO(kaznacheev): Remove this method and inline its implementation at the
 // only place where it is used (DriveTaskExecutor::OnAppAuthorized)
 Browser* FileTaskExecutor::GetBrowser() const {
-  return browser::FindOrCreateTabbedBrowser(
+  return chrome::FindOrCreateTabbedBrowser(
       profile_ ? profile_ : ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
 }
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index f3501c1..8278958 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -208,7 +208,7 @@ DictionaryValue* ProgessStatusToDictionaryValue(
 
 void OpenNewTab(const GURL& url, Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
+  Browser* browser = chrome::FindOrCreateTabbedBrowser(
       profile ? profile : ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
   chrome::AddSelectedTabWithURL(browser, url, content::PAGE_TRANSITION_LINK);
@@ -222,8 +222,8 @@ void ShowWarningMessageBox(Profile* profile, const FilePath& path) {
   // TODO: if FindOrCreateTabbedBrowser creates a new browser the returned
   // browser is leaked.
   Browser* browser =
-      browser::FindOrCreateTabbedBrowser(profile,
-                                         chrome::HOST_DESKTOP_TYPE_ASH);
+      chrome::FindOrCreateTabbedBrowser(profile,
+                                        chrome::HOST_DESKTOP_TYPE_ASH);
   chrome::ShowMessageBox(
       browser->window()->GetNativeWindow(),
       l10n_util::GetStringFUTF16(
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 8bd89fc..adba539 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -83,7 +83,7 @@ bool ShouldHighlightNetwork(const chromeos::Network* network) {
 // browser window with an empty tab and returns it.
 Browser* GetAppropriateBrowser() {
   DCHECK(chromeos::UserManager::Get()->IsSessionStarted());
-  return browser::FindOrCreateTabbedBrowser(
+  return chrome::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
 }
@@ -433,7 +433,7 @@ void NetworkMenuModel::ActivatedAt(int index) {
     if (active_vpn)
       cros->DisconnectFromNetwork(active_vpn);
   } else if (flags & FLAG_VIEW_ACCOUNT) {
-    Browser* browser = browser::FindOrCreateTabbedBrowser(
+    Browser* browser = chrome::FindOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord(),
         chrome::HOST_DESKTOP_TYPE_ASH);
     chrome::ShowSingletonTab(browser, GURL(top_up_url_));
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 21d84cd..57aa83b 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -871,7 +871,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
   // Returns the last active browser. If there is no such browser, creates a new
   // browser window with an empty tab and returns it.
   Browser* GetAppropriateBrowser() {
-    return browser::FindOrCreateTabbedBrowser(
+    return chrome::FindOrCreateTabbedBrowser(
         ProfileManager::GetDefaultProfileOrOffTheRecord(),
         chrome::HOST_DESKTOP_TYPE_ASH);
   }
diff --git a/chrome/browser/extensions/extension_install_ui_default.cc b/chrome/browser/extensions/extension_install_ui_default.cc
index dcb7f70..af6834f 100644
--- a/chrome/browser/extensions/extension_install_ui_default.cc
+++ b/chrome/browser/extensions/extension_install_ui_default.cc
@@ -133,8 +133,8 @@ void ExtensionInstallUIDefault::OnInstallSuccess(const Extension* extension,
   // the install in a normal window.
   Profile* current_profile = profile_->GetOriginalProfile();
   Browser* browser =
-      browser::FindOrCreateTabbedBrowser(current_profile,
-                                         chrome::GetActiveDesktop());
+      chrome::FindOrCreateTabbedBrowser(current_profile,
+                                        chrome::GetActiveDesktop());
   if (browser->tab_count() == 0)
     chrome::AddBlankTabAt(browser, -1, true);
   browser->window()->Show();
diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc
index 9f009c2..dc54dca 100644
--- a/chrome/browser/extensions/extension_process_manager.cc
+++ b/chrome/browser/extensions/extension_process_manager.cc
@@ -316,8 +316,8 @@ void ExtensionProcessManager::OpenOptionsPage(const Extension* extension,
   // able to save settings from OTR.
   if (browser->profile()->IsOffTheRecord()) {
     Profile* profile = GetProfile();
-    browser = browser::FindOrCreateTabbedBrowser(profile->GetOriginalProfile(),
-                                                 browser->host_desktop_type());
+    browser = chrome::FindOrCreateTabbedBrowser(profile->GetOriginalProfile(),
+                                                browser->host_desktop_type());
   }
 
   OpenURLParams params(extension->options_url(), Referrer(), SINGLETON_TAB,
diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc
index 6b53020..7a9e7e7 100644
--- a/chrome/browser/platform_util_chromeos.cc
+++ b/chrome/browser/platform_util_chromeos.cc
@@ -38,7 +38,7 @@ void OpenItemOnFileThread(const FilePath& full_path) {
 
 void OpenURL(const std::string& url) {
   // TODO(beng): improve this to locate context from call stack.
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
+  Browser* browser = chrome::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
   chrome::NavigateParams params(
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index b55e604..9dedc57 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -1279,7 +1279,7 @@ TaskManager* TaskManager::GetInstance() {
 }
 
 void TaskManager::OpenAboutMemory(chrome::HostDesktopType desktop_type) {
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
+  Browser* browser = chrome::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord(), desktop_type);
   chrome::NavigateParams params(browser, GURL(chrome::kChromeUIMemoryURL),
                                 content::PAGE_TRANSITION_LINK);
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index f93747d..9b22a56 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -70,7 +70,7 @@ Browser* GetTargetBrowser() {
   Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
   if (browser)
     return browser;
-  return browser::FindOrCreateTabbedBrowser(
+  return chrome::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
 }
@@ -300,7 +300,7 @@ void ChromeShellDelegate::ShowKeyboardOverlay() {
 }
 
 void ChromeShellDelegate::ShowTaskManager() {
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
+  Browser* browser = chrome::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
   chrome::OpenTaskManager(browser, false);
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 926d473..e7e6624 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -317,7 +317,7 @@ void OpenWindowWithRestoredTabs(Profile* profile) {
 void OpenURLOffTheRecord(Profile* profile,
                          const GURL& url,
                          chrome::HostDesktopType desktop_type) {
-  Browser* browser = browser::FindOrCreateTabbedBrowser(
+  Browser* browser = chrome::FindOrCreateTabbedBrowser(
       profile->GetOffTheRecordProfile(), desktop_type);
   AddSelectedTabWithURL(browser, url, content::PAGE_TRANSITION_LINK);
   browser->window()->Show();
@@ -468,8 +468,8 @@ void NewTab(Browser* browser) {
     GetActiveWebContents(browser)->GetView()->RestoreFocus();
   } else {
     Browser* b =
-        browser::FindOrCreateTabbedBrowser(browser->profile(),
-                                           browser->host_desktop_type());
+        chrome::FindOrCreateTabbedBrowser(browser->profile(),
+                                          browser->host_desktop_type());
     AddBlankTabAt(b, -1, true);
     b->window()->Show();
     // The call to AddBlankTabAt above did not set the focus to the tab as its
diff --git a/chrome/browser/ui/browser_finder.cc b/chrome/browser/ui/browser_finder.cc
index 3c7c1d5..ef14ef0 100644
--- a/chrome/browser/ui/browser_finder.cc
+++ b/chrome/browser/ui/browser_finder.cc
@@ -135,18 +135,17 @@ Browser* FindTabbedBrowser(Profile* profile,
                                         match_original_profiles);
 }
 
-Browser* FindOrCreateTabbedBrowser(Profile* profile,
-                                   chrome::HostDesktopType type) {
-  Browser* browser = FindTabbedBrowser(profile, false, type);
+}  // namespace browser
+
+namespace chrome {
+
+Browser* FindOrCreateTabbedBrowser(Profile* profile, HostDesktopType type) {
+  Browser* browser = browser::FindTabbedBrowser(profile, false, type);
   if (!browser)
     browser = new Browser(Browser::CreateParams(profile, type));
   return browser;
 }
 
-}  // namespace browser
-
-namespace chrome {
-
 Browser* FindAnyBrowser(Profile* profile,
                         bool match_original_profiles,
                         HostDesktopType type) {
@@ -189,7 +188,7 @@ Browser* FindBrowserWithWebContents(const WebContents* web_contents) {
   return NULL;
 }
 
-chrome::HostDesktopType FindHostDesktopTypeForWebContents(
+HostDesktopType FindHostDesktopTypeForWebContents(
     const WebContents* web_contents) {
   Browser* browser = FindBrowserWithWebContents(web_contents);
   return browser ? browser->host_desktop_type() : HOST_DESKTOP_TYPE_NATIVE;
diff --git a/chrome/browser/ui/browser_finder.h b/chrome/browser/ui/browser_finder.h
index 827c3c6..76e9d2d 100644
--- a/chrome/browser/ui/browser_finder.h
+++ b/chrome/browser/ui/browser_finder.h
@@ -30,16 +30,15 @@ Browser* FindTabbedBrowser(Profile* profile,
                            bool match_original_profiles,
                            chrome::HostDesktopType type);
 
-// Returns the first tabbed browser matching |profile|. If there is no tabbed
-// browser a new one is created and returned for the desktop specified by
-// |type|. If a new browser is created it is not made visible.
-Browser* FindOrCreateTabbedBrowser(Profile* profile,
-                                   chrome::HostDesktopType type);
-
 }  // namespace browser
 
 namespace chrome {
 
+// Returns the first tabbed browser matching |profile|. If there is no tabbed
+// browser a new one is created and returned for the desktop specified by
+// |type|. If a new browser is created it is not made visible.
+Browser* FindOrCreateTabbedBrowser(Profile* profile, HostDesktopType type);
+
 // Finds an existing browser window of any kind.
 // |type| refers to the host desktop the returned browser should belong to.
 Browser* FindAnyBrowser(Profile* profile,
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 4765074..aa3adea 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -101,7 +101,7 @@ bool AdjustNavigateParamsForURL(chrome::NavigateParams* params) {
 
     params->disposition = SINGLETON_TAB;
     params->browser =
-        browser::FindOrCreateTabbedBrowser(profile, params->host_desktop_type);
+        chrome::FindOrCreateTabbedBrowser(profile, params->host_desktop_type);
     params->window_action = chrome::NavigateParams::SHOW_WINDOW;
   }
 
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 20855b5..999ea18 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -193,8 +193,8 @@ void ShowSyncSetup(Browser* browser, SyncPromoUI::Source source) {
     // from an incognito window.
     if (browser->profile()->IsOffTheRecord()) {
       browser =
-          browser::FindOrCreateTabbedBrowser(original_profile,
-                                             chrome::HOST_DESKTOP_TYPE_NATIVE);
+          chrome::FindOrCreateTabbedBrowser(original_profile,
+                                            chrome::HOST_DESKTOP_TYPE_NATIVE);
     }
 
     const bool use_web_flow = SyncPromoUI::UseWebBasedSigninFlow();
diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm
index 4a31cb1..3db9198 100644
--- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm
@@ -40,8 +40,8 @@ using content::Referrer;
 // Open the URL of the given history item in the current tab.
 - (void)openURLForItem:(const HistoryMenuBridge::HistoryItem*)node {
   Browser* browser =
-      browser::FindOrCreateTabbedBrowser(bridge_->profile(),
-                                         chrome::HOST_DESKTOP_TYPE_NATIVE);
+      chrome::FindOrCreateTabbedBrowser(bridge_->profile(),
+                                        chrome::HOST_DESKTOP_TYPE_NATIVE);
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
 
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index 93752c0..6e91482 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -315,7 +315,7 @@ void ShellWindow::AddNewContents(WebContents* source,
   DCHECK(Profile::FromBrowserContext(new_contents->GetBrowserContext()) ==
       profile_);
   Browser* browser =
-      browser::FindOrCreateTabbedBrowser(profile_, chrome::GetActiveDesktop());
+      chrome::FindOrCreateTabbedBrowser(profile_, chrome::GetActiveDesktop());
   // Force all links to open in a new tab, even if they were trying to open a
   // new window.
   disposition =
diff --git a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc
index 7a3fd52..286502a 100644
--- a/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc
+++ b/chrome/browser/ui/views/ash/balloon_collection_impl_ash.cc
@@ -70,8 +70,8 @@ void BalloonCollectionImplAsh::ShowSettings(
   Profile* profile =
       balloon ? balloon->profile() : ProfileManager::GetDefaultProfile();
   Browser* browser =
-      browser::FindOrCreateTabbedBrowser(profile,
-                                         chrome::HOST_DESKTOP_TYPE_ASH);
+      chrome::FindOrCreateTabbedBrowser(profile,
+                                        chrome::HOST_DESKTOP_TYPE_ASH);
   if (GetBalloonExtension(balloon))
     chrome::ShowExtensions(browser);
   else
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
index a93c597..ac8a380 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -1518,7 +1518,7 @@ gfx::NativeWindow InternetOptionsHandler::GetNativeWindow() const {
 }
 
 Browser* InternetOptionsHandler::GetAppropriateBrowser() {
-  return browser::FindOrCreateTabbedBrowser(
+  return chrome::FindOrCreateTabbedBrowser(
       ProfileManager::GetDefaultProfileOrOffTheRecord(),
       chrome::HOST_DESKTOP_TYPE_ASH);
 }