diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 20:13:58 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 20:13:58 +0000 |
| commit | abcfa65ad3be10658bfcf6262c152cae8588dc90 (patch) | |
| tree | e602b146f430556c7cf608c4b9701ee7478380c6 /chrome/browser/automation/automation_util.cc | |
| parent | 7caa95de14beff32bc64fa9f2cfcba30d93fd0e0 (diff) | |
| download | chromium_src-abcfa65ad3be10658bfcf6262c152cae8588dc90.zip chromium_src-abcfa65ad3be10658bfcf6262c152cae8588dc90.tar.gz chromium_src-abcfa65ad3be10658bfcf6262c152cae8588dc90.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, 177341
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183580
Reverted: https://src.chromium.org/viewvc/chrome?view=rev&revision=183701
Review URL: https://chromiumcodereview.appspot.com/12281006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation/automation_util.cc')
| -rw-r--r-- | chrome/browser/automation/automation_util.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index b844bac..97978f21 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -27,7 +27,7 @@ #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_iterator.h" -#include "chrome/browser/ui/browser_list_impl.h" +#include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/view_type_utils.h" @@ -156,8 +156,8 @@ namespace automation_util { Browser* GetBrowserAt(int index) { // The automation layer doesn't support non-native desktops. - chrome::BrowserListImpl* native_list = - chrome::BrowserListImpl::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE); + BrowserList* native_list = + BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE); if (index < 0 || index >= static_cast<int>(native_list->size())) return NULL; return native_list->get(index); |