Remove HostDesktopType from BrowserList::GetInstance()

chrome/browser/ui/browser_list.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_list.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/user_metrics.h"
 
 using base::UserMetricsAction;
 using content::WebContents;
 
 // static
 base::LazyInstance<base::ObserverList<chrome::BrowserListObserver>>::Leaky
     BrowserList::observers_ = LAZY_INSTANCE_INITIALIZER;
 
 // static
-BrowserList* BrowserList::native_instance_ = NULL;
-BrowserList* BrowserList::ash_instance_ = NULL;
+BrowserList* BrowserList::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserList, public:
 
 Browser* BrowserList::GetLastActive() const {
   if (!last_active_browsers_.empty())
     return *(last_active_browsers_.rbegin());
   return NULL;
 }
 
 // static
-BrowserList* BrowserList::GetInstance(chrome::HostDesktopType type) {
+BrowserList* BrowserList::GetInstance() {
   BrowserList** list = NULL;
-  if (type == chrome::HOST_DESKTOP_TYPE_NATIVE)
-    list = &native_instance_;
-  else if (type == chrome::HOST_DESKTOP_TYPE_ASH)
-    list = &ash_instance_;
-  else
-    NOTREACHED();
+  list = &instance_;
   if (!*list)
     *list = new BrowserList;
   return *list;
 }
 
 // static
 void BrowserList::AddBrowser(Browser* browser) {
   DCHECK(browser);
-  // Push |browser| on the appropriate list instance.
-  BrowserList* browser_list = GetInstance(browser->host_desktop_type());
-  browser_list->browsers_.push_back(browser);
+  GetInstance()->browsers_.push_back(browser);
 
   g_browser_process->AddRefModule();
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_OPENED,
       content::Source<Browser>(browser),
       content::NotificationService::NoDetails());
 
   FOR_EACH_OBSERVER(chrome::BrowserListObserver, observers_.Get(),
                     OnBrowserAdded(browser));
 }
 
 // static
 void BrowserList::RemoveBrowser(Browser* browser) {
   // Remove |browser| from the appropriate list instance.
-  BrowserList* browser_list = GetInstance(browser->host_desktop_type());
+  BrowserList* browser_list = GetInstance();
   RemoveBrowserFrom(browser, &browser_list->last_active_browsers_);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser),
       content::NotificationService::NoDetails());
 
   RemoveBrowserFrom(browser, &browser_list->browsers_);
 
   FOR_EACH_OBSERVER(chrome::BrowserListObserver, observers_.Get(),
@@ skipping 97 matching lines @@
     for (BrowserVector::const_iterator it = browsers_to_close.begin();
          it != browsers_to_close.end(); ++it) {
       (*it)->ResetBeforeUnloadHandlers();
     }
   }
 }
 
 // static
 void BrowserList::SetLastActive(Browser* browser) {
   content::RecordAction(UserMetricsAction("ActiveBrowserChanged"));
-  BrowserList* browser_list = GetInstance(browser->host_desktop_type());
 
-  RemoveBrowserFrom(browser, &browser_list->last_active_browsers_);
-  browser_list->last_active_browsers_.push_back(browser);
+  RemoveBrowserFrom(browser, &GetInstance()->last_active_browsers_);
+  GetInstance()->last_active_browsers_.push_back(browser);
 
   FOR_EACH_OBSERVER(chrome::BrowserListObserver, observers_.Get(),
                     OnBrowserSetLastActive(browser));
 }
 
 // static
 bool BrowserList::IsOffTheRecordSessionActive() {
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     if (it->profile()->IsOffTheRecord())
       return true;
@@ skipping 22 matching lines @@
 }
 
 // static
 void BrowserList::RemoveBrowserFrom(Browser* browser,
                                     BrowserVector* browser_list) {
   BrowserVector::iterator remove_browser =
       std::find(browser_list->begin(), browser_list->end(), browser);
   if (remove_browser != browser_list->end())
     browser_list->erase(remove_browser);
 }