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

Unified Diff: chrome/browser/lifetime/application_lifetime.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/lifetime/application_lifetime.cc
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc
index 1986d1b3a5c44e9159c4943b7a1919cb8b1c3d0a..5bf7e94c132e2691a52039dd595e5b18b40d0fa9 100644
--- a/chrome/browser/lifetime/application_lifetime.cc
+++ b/chrome/browser/lifetime/application_lifetime.cc
@@ -416,10 +416,10 @@ bool ShouldStartShutdown(Browser* browser) {
// are browser windows open in the desktop.
// 2. If the desktop type of the browser going away is desktop and the ASH
// environment is still active.
- if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
+ if (browser->host_desktop_type() == ui::HOST_DESKTOP_TYPE_NATIVE)
return !ash::Shell::HasInstance();
- else if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
- return BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE)->empty();
+ else if (browser->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH)
+ return BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE)->empty();
#endif
return true;
}

Powered by Google App Engine
This is Rietveld 408576698