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

Side by Side Diff: chrome/browser/ui/browser_iterator.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/browser_iterator.h" 5 #include "chrome/browser/ui/browser_iterator.h"
6 6
7 namespace chrome { 7 namespace chrome {
8 8
9 BrowserIterator::BrowserIterator() 9 BrowserIterator::BrowserIterator()
10 : current_browser_list_(BrowserList::GetInstance(HOST_DESKTOP_TYPE_FIRST)), 10 : current_browser_list_(
11 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_FIRST)),
11 current_iterator_(current_browser_list_->begin()), 12 current_iterator_(current_browser_list_->begin()),
12 next_desktop_type_( 13 next_desktop_type_(
13 static_cast<HostDesktopType>(HOST_DESKTOP_TYPE_FIRST + 1)) { 14 static_cast<ui::HostDesktopType>(ui::HOST_DESKTOP_TYPE_FIRST + 1)) {
14 NextBrowserListIfAtEnd(); 15 NextBrowserListIfAtEnd();
15 } 16 }
16 17
17 BrowserIterator::~BrowserIterator() { 18 BrowserIterator::~BrowserIterator() {
18 } 19 }
19 20
20 void BrowserIterator::Next() { 21 void BrowserIterator::Next() {
21 ++current_iterator_; 22 ++current_iterator_;
22 NextBrowserListIfAtEnd(); 23 NextBrowserListIfAtEnd();
23 } 24 }
24 25
25 void BrowserIterator::NextBrowserListIfAtEnd() { 26 void BrowserIterator::NextBrowserListIfAtEnd() {
26 // Make sure either |current_iterator_| is valid or done(). 27 // Make sure either |current_iterator_| is valid or done().
27 while (current_iterator_ == current_browser_list_->end() && 28 while (current_iterator_ == current_browser_list_->end() &&
28 next_desktop_type_ < HOST_DESKTOP_TYPE_COUNT) { 29 next_desktop_type_ < ui::HOST_DESKTOP_TYPE_COUNT) {
29 current_browser_list_ = BrowserList::GetInstance(next_desktop_type_); 30 current_browser_list_ = BrowserList::GetInstance(next_desktop_type_);
30 current_iterator_ = current_browser_list_->begin(); 31 current_iterator_ = current_browser_list_->begin();
31 next_desktop_type_ = static_cast<HostDesktopType>(next_desktop_type_ + 1); 32 next_desktop_type_ =
33 static_cast<ui::HostDesktopType>(next_desktop_type_ + 1);
32 } 34 }
33 } 35 }
34 36
35 } // namespace chrome 37 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698