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

Unified Diff: chrome/browser/ui/aura/active_desktop_monitor.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/aura/active_desktop_monitor.cc
diff --git a/chrome/browser/ui/aura/active_desktop_monitor.cc b/chrome/browser/ui/aura/active_desktop_monitor.cc
index f6c5a7b883d2ea5b3aecbd2b674db9943837e380..61fb15ff6fc1f516d633b0452ea81cc95b42c117 100644
--- a/chrome/browser/ui/aura/active_desktop_monitor.cc
+++ b/chrome/browser/ui/aura/active_desktop_monitor.cc
@@ -16,8 +16,7 @@
// static
ActiveDesktopMonitor* ActiveDesktopMonitor::g_instance_ = NULL;
-ActiveDesktopMonitor::ActiveDesktopMonitor(
- chrome::HostDesktopType initial_desktop)
+ActiveDesktopMonitor::ActiveDesktopMonitor(ui::HostDesktopType initial_desktop)
: last_activated_desktop_(initial_desktop) {
DCHECK(!g_instance_);
g_instance_ = this;
@@ -31,10 +30,10 @@ ActiveDesktopMonitor::~ActiveDesktopMonitor() {
}
// static
-chrome::HostDesktopType ActiveDesktopMonitor::GetLastActivatedDesktopType() {
+ui::HostDesktopType ActiveDesktopMonitor::GetLastActivatedDesktopType() {
// Tests may not have created the monitor.
- return g_instance_ ? g_instance_->last_activated_desktop_ :
- chrome::HOST_DESKTOP_TYPE_NATIVE;
+ return g_instance_ ? g_instance_->last_activated_desktop_
+ : ui::HOST_DESKTOP_TYPE_NATIVE;
}
// static
@@ -58,10 +57,12 @@ void ActiveDesktopMonitor::OnWindowInitialized(aura::Window* window) {}
void ActiveDesktopMonitor::OnHostActivated(aura::WindowTreeHost* host) {
if (IsDesktopWindow(host))
- last_activated_desktop_ = chrome::HOST_DESKTOP_TYPE_NATIVE;
+ last_activated_desktop_ = ui::HOST_DESKTOP_TYPE_NATIVE;
else
- last_activated_desktop_ = chrome::HOST_DESKTOP_TYPE_ASH;
+ last_activated_desktop_ = ui::HOST_DESKTOP_TYPE_ASH;
DVLOG(1) << __FUNCTION__
- << (last_activated_desktop_ == chrome::HOST_DESKTOP_TYPE_NATIVE ?
- " native" : " ash") << " desktop activated.";
+ << (last_activated_desktop_ == ui::HOST_DESKTOP_TYPE_NATIVE
+ ? " native"
+ : " ash")
+ << " desktop activated.";
}

Powered by Google App Engine
This is Rietveld 408576698