Revert 152788 - Give access to browsers by Profile/HostDesktopType.

chrome/browser/ui/browser_finder.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/browser_finder.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_impl.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/navigation_controller.h"
 
 using content::WebContents;
 
 namespace browser {
 
 namespace {
 
-// TODO(mad) eventually move this to host_desktop_type.h.
-#if defined(OS_CHROMEOS)
-chrome::HostDesktopType kDefaultHostDesktopType = chrome::HOST_DESKTOP_TYPE_ASH;
-#else
-chrome::HostDesktopType kDefaultHostDesktopType =
-    chrome::HOST_DESKTOP_TYPE_NATIVE;
-#endif
-
-
 // Type used to indicate to match anything.
 const int kMatchAny                     = 0;
 
 // See BrowserMatches for details.
 const int kMatchOriginalProfile         = 1 << 0;
 const int kMatchCanSupportWindowFeature = 1 << 1;
 const int kMatchTabbed                  = 1 << 2;
 
 // Returns true if the specified |browser| matches the specified arguments.
 // |match_types| is a bitmask dictating what parameters to match:
@@ skipping 36 matching lines @@
                              Browser::WindowFeature window_feature,
                              uint32 match_types) {
   for (T i = begin; i != end; ++i) {
     if (BrowserMatches(*i, profile, window_feature, match_types))
       return *i;
   }
   return NULL;
 }
 
 Browser* FindBrowserWithTabbedOrAnyType(Profile* profile,
-                                        chrome::HostDesktopType desktop_type,
                                         bool match_tabbed,
                                         bool match_original_profiles) {
-  chrome::BrowserListImpl* browser_list_impl =
-      chrome::BrowserListImpl::GetInstance(desktop_type);
-  if (!browser_list_impl)
-    return NULL;
   uint32 match_types = kMatchAny;
   if (match_tabbed)
     match_types |= kMatchTabbed;
   if (match_original_profiles)
     match_types |= kMatchOriginalProfile;
-  Browser* browser = FindBrowserMatching(browser_list_impl->begin_last_active(),
-                                         browser_list_impl->end_last_active(),
-                                         profile,
-                                         Browser::FEATURE_NONE,
-                                         match_types);
+  Browser* browser = FindBrowserMatching(
+      BrowserList::begin_last_active(), BrowserList::end_last_active(),
+      profile, Browser::FEATURE_NONE, match_types);
   // Fall back to a forward scan of all Browsers if no active one was found.
-  return browser ? browser : FindBrowserMatching(browser_list_impl->begin(),
-                                                 browser_list_impl->end(),
-                                                 profile,
-                                                 Browser::FEATURE_NONE,
-                                                 match_types);
+  return browser ? browser :
+      FindBrowserMatching(BrowserList::begin(), BrowserList::end(), profile,
+                          Browser::FEATURE_NONE, match_types);
 }
 
-size_t GetBrowserCountImpl(Profile* profile,
-                           chrome::HostDesktopType desktop_type,
-                           uint32 match_types) {
-  chrome::BrowserListImpl* browser_list_impl =
-      chrome::BrowserListImpl::GetInstance(desktop_type);
+size_t GetBrowserCountImpl(Profile* profile, uint32 match_types) {
   size_t count = 0;
-  if (browser_list_impl) {
-    for (BrowserList::const_iterator i = browser_list_impl->begin();
-         i != browser_list_impl->end(); ++i) {
-      if (BrowserMatches(*i, profile, Browser::FEATURE_NONE, match_types))
-        count++;
-    }
+  for (BrowserList::const_iterator i = BrowserList::begin();
+       i != BrowserList::end(); ++i) {
+    if (BrowserMatches(*i, profile, Browser::FEATURE_NONE, match_types))
+      count++;
   }
   return count;
 }
 
 }  // namespace
 
 Browser* FindTabbedBrowser(Profile* profile, bool match_original_profiles) {
   return FindBrowserWithTabbedOrAnyType(profile,
-                                        kDefaultHostDesktopType,
                                         true,
                                         match_original_profiles);
 }
 
 Browser* FindOrCreateTabbedBrowser(Profile* profile) {
   Browser* browser = FindTabbedBrowser(profile, false);
   if (!browser)
     browser = new Browser(Browser::CreateParams(profile));
   return browser;
 }
 
 Browser* FindAnyBrowser(Profile* profile, bool match_original_profiles) {
   return FindBrowserWithTabbedOrAnyType(profile,
-                                        kDefaultHostDesktopType,
                                         false,
                                         match_original_profiles);
 }
 
-Browser* FindBrowserWithProfile(Profile* profile,
-                                chrome::HostDesktopType desktop_type) {
-  return FindBrowserWithTabbedOrAnyType(profile, desktop_type, false, false);
+Browser* FindBrowserWithProfile(Profile* profile) {
+  return FindAnyBrowser(profile, false);
 }
 
 Browser* FindBrowserWithID(SessionID::id_type desired_id) {
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end(); ++i) {
     if ((*i)->session_id().id() == desired_id)
       return *i;
   }
   return NULL;
 }
@@ skipping 27 matching lines @@
 
 Browser* FindLastActiveWithHostDesktopType(chrome::HostDesktopType type) {
   chrome::BrowserListImpl* browser_list_impl =
       chrome::BrowserListImpl::GetInstance(type);
   if (browser_list_impl)
     return browser_list_impl->GetLastActive();
   return NULL;
 }
 
 size_t GetBrowserCount(Profile* profile) {
-  return GetBrowserCountImpl(profile, kDefaultHostDesktopType, kMatchAny);
+  return GetBrowserCountImpl(profile, kMatchAny);
 }
 
 size_t GetTabbedBrowserCount(Profile* profile) {
-  return GetBrowserCountImpl(profile, kDefaultHostDesktopType, kMatchTabbed);
+  return GetBrowserCountImpl(profile, kMatchTabbed);
 }
 
 }  // namespace browser