Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5071)

Unified Diff: chrome/browser/ui/browser_list.h

Issue 1637943003: Remove HostDesktopType from BrowserList::GetInstance() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screen-wrapper-land
Patch Set: mac2 Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_iterator_unittest.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_list.h
diff --git a/chrome/browser/ui/browser_list.h b/chrome/browser/ui/browser_list.h
index da1330aa94f5a6e23cff0b8e54d4472cb4b4f14f..147a6740d404ffd1825752808343b0eafd90e923 100644
--- a/chrome/browser/ui/browser_list.h
+++ b/chrome/browser/ui/browser_list.h
@@ -12,7 +12,6 @@
#include "base/lazy_instance.h"
#include "base/macros.h"
#include "base/observer_list.h"
-#include "chrome/browser/ui/host_desktop.h"
class Browser;
class Profile;
@@ -25,8 +24,7 @@ namespace chrome {
class BrowserListObserver;
}
-// Maintains a list of Browser objects present in a given HostDesktop (see
-// HostDesktopType).
+// Maintains a list of Browser objects.
class BrowserList {
public:
typedef std::vector<Browser*> BrowserVector;
@@ -57,7 +55,7 @@ class BrowserList {
return last_active_browsers_.rend();
}
- static BrowserList* GetInstance(chrome::HostDesktopType type);
+ static BrowserList* GetInstance();
// Adds or removes |browser| from the list it is associated with. The browser
// object should be valid BEFORE these calls (for the benefit of observers),
@@ -138,9 +136,7 @@ class BrowserList {
static base::LazyInstance<
base::ObserverList<chrome::BrowserListObserver>>::Leaky observers_;
- // Nothing fancy, since we only have two HDTs.
- static BrowserList* native_instance_;
- static BrowserList* ash_instance_;
+ static BrowserList* instance_;
DISALLOW_COPY_AND_ASSIGN(BrowserList);
};
« no previous file with comments | « chrome/browser/ui/browser_iterator_unittest.cc ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698