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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_iterator.cc
diff --git a/chrome/browser/ui/browser_iterator.cc b/chrome/browser/ui/browser_iterator.cc
index 4a69c1d7a0c2e6beaada0d142b6ac2d0fc08c9fe..5c910be630656dbb0d3f3e6e4c09d0bfa621b3cd 100644
--- a/chrome/browser/ui/browser_iterator.cc
+++ b/chrome/browser/ui/browser_iterator.cc
@@ -7,10 +7,11 @@
namespace chrome {
BrowserIterator::BrowserIterator()
- : current_browser_list_(BrowserList::GetInstance(HOST_DESKTOP_TYPE_FIRST)),
+ : current_browser_list_(
+ BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_FIRST)),
current_iterator_(current_browser_list_->begin()),
next_desktop_type_(
- static_cast<HostDesktopType>(HOST_DESKTOP_TYPE_FIRST + 1)) {
+ static_cast<ui::HostDesktopType>(ui::HOST_DESKTOP_TYPE_FIRST + 1)) {
NextBrowserListIfAtEnd();
}
@@ -25,10 +26,11 @@ void BrowserIterator::Next() {
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) {
+ next_desktop_type_ < ui::HOST_DESKTOP_TYPE_COUNT) {
current_browser_list_ = BrowserList::GetInstance(next_desktop_type_);
current_iterator_ = current_browser_list_->begin();
- next_desktop_type_ = static_cast<HostDesktopType>(next_desktop_type_ + 1);
+ next_desktop_type_ =
+ static_cast<ui::HostDesktopType>(next_desktop_type_ + 1);
}
}

Powered by Google App Engine
This is Rietveld 408576698