diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 01:37:08 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-21 01:37:08 +0000 |
| commit | 119e8cfc6366a3958129ed4a08e9011b0770a072 (patch) | |
| tree | 55a5dc312791891db5c286ad8e808a0068222b0b /chrome/browser/ui/browser_iterator.cc | |
| parent | 938dad8ea926a90c64d7b9495cb1abac0b361d5e (diff) | |
| download | chromium_src-119e8cfc6366a3958129ed4a08e9011b0770a072.zip chromium_src-119e8cfc6366a3958129ed4a08e9011b0770a072.tar.gz chromium_src-119e8cfc6366a3958129ed4a08e9011b0770a072.tar.bz2 | |
Revert 183580 - added a static initializer on Mac
> 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
TBR=gab@chromium.org
Review URL: https://codereview.chromium.org/12310034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@183701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_iterator.cc')
| -rw-r--r-- | chrome/browser/ui/browser_iterator.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_iterator.cc b/chrome/browser/ui/browser_iterator.cc index 96df7fd..73571d5 100644 --- a/chrome/browser/ui/browser_iterator.cc +++ b/chrome/browser/ui/browser_iterator.cc @@ -7,7 +7,8 @@ namespace chrome { BrowserIterator::BrowserIterator() - : current_browser_list_(BrowserList::GetInstance(HOST_DESKTOP_TYPE_FIRST)), + : current_browser_list_( + BrowserListImpl::GetInstance(HOST_DESKTOP_TYPE_FIRST)), current_iterator_(current_browser_list_->begin()), next_desktop_type_( static_cast<HostDesktopType>(HOST_DESKTOP_TYPE_FIRST + 1)) { @@ -23,7 +24,7 @@ void BrowserIterator::NextBrowserListIfAtEnd() { // Make sure either |current_iterator_| is valid or done(). while (current_iterator_ == current_browser_list_->end() && next_desktop_type_ < HOST_DESKTOP_TYPE_COUNT) { - current_browser_list_ = BrowserList::GetInstance(next_desktop_type_); + current_browser_list_ = BrowserListImpl::GetInstance(next_desktop_type_); current_iterator_ = current_browser_list_->begin(); next_desktop_type_ = static_cast<HostDesktopType>(next_desktop_type_ + 1); } |