diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 19:02:25 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-20 19:02:25 +0000 |
| commit | 8052b519ec25a37f97c3bf5bbae9d357d6d18637 (patch) | |
| tree | f9a92ecd76e432eda660e640206b102734b44514 /chrome/browser/metro_viewer | |
| parent | b3bab6c50a9361372baf60f04d2cba76c20d9a87 (diff) | |
| download | chromium_src-8052b519ec25a37f97c3bf5bbae9d357d6d18637.zip chromium_src-8052b519ec25a37f97c3bf5bbae9d357d6d18637.tar.gz chromium_src-8052b519ec25a37f97c3bf5bbae9d357d6d18637.tar.bz2 | |
Merge BrowserListImpl into BrowserList.
Kept AddBrowser and RemoveBrowser static (having it access the private members of the appropriate list for the browser added/removed); kept AddObserver and RemoveObserver static so that observers are notified about browser additions, removals, and set actives on every desktop (observers should filter if they so desire).
The only calls that are not-static (i.e. for which consumers need to be aware of HostDesktopType) are: iterators, size(), empty(), get(), and GetLastActive(). All the consumers were already made multi-desktop aware in the multiple CLs preceding this one :)!
BUG=129187
Review URL: https://chromiumcodereview.appspot.com/12281006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metro_viewer')
| -rw-r--r-- | chrome/browser/metro_viewer/metro_viewer_process_host_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/metro_viewer/metro_viewer_process_host_win.cc b/chrome/browser/metro_viewer/metro_viewer_process_host_win.cc index c0e8a6b..3ed753a 100644 --- a/chrome/browser/metro_viewer/metro_viewer_process_host_win.cc +++ b/chrome/browser/metro_viewer/metro_viewer_process_host_win.cc @@ -8,7 +8,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/ash/ash_init.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_list_impl.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -22,11 +22,11 @@ namespace { void CloseOpenAshBrowsers() { - chrome::BrowserListImpl* browser_list = - chrome::BrowserListImpl::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); + BrowserList* browser_list = + BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH); if (browser_list) { - for (chrome::BrowserListImpl::const_iterator i = browser_list->begin(); - i != browser_list->end(); ++i) { + for (BrowserList::const_iterator i = browser_list->begin(); + i != browser_list->end(); ++i) { Browser* browser = *i; browser->window()->Close(); // If the attempt to Close the browser fails due to unload handlers on |