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

Unified Diff: chrome/browser/ui/aura/active_desktop_monitor.h

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.h
diff --git a/chrome/browser/ui/aura/active_desktop_monitor.h b/chrome/browser/ui/aura/active_desktop_monitor.h
index bd33d604caf535f00f69b90398b254e8d8386b54..f9956fb4e51499ad3dfb1e91aeb1bc37951781d3 100644
--- a/chrome/browser/ui/aura/active_desktop_monitor.h
+++ b/chrome/browser/ui/aura/active_desktop_monitor.h
@@ -16,14 +16,14 @@ class ActiveDesktopMonitor : public aura::EnvObserver {
public:
// Constructs an ActiveDesktopMonitor which initially uses |initial_desktop|
// as the |last_activated_desktop_| until a root window is activated.
- explicit ActiveDesktopMonitor(chrome::HostDesktopType initial_desktop);
+ explicit ActiveDesktopMonitor(ui::HostDesktopType initial_desktop);
~ActiveDesktopMonitor() override;
// Returns the host desktop type of the most-recently activated
// WindowTreeHost. This desktop type may no longer exist (e.g., the Ash
// desktop may have closed since being active, and no RWHs on the native
// desktop have yet been activated).
- static chrome::HostDesktopType GetLastActivatedDesktopType();
+ static ui::HostDesktopType GetLastActivatedDesktopType();
private:
// Returns true if |host| is a DesktopWindowTreeHost.
@@ -34,7 +34,7 @@ class ActiveDesktopMonitor : public aura::EnvObserver {
void OnHostActivated(aura::WindowTreeHost* host) override;
static ActiveDesktopMonitor* g_instance_;
- chrome::HostDesktopType last_activated_desktop_;
+ ui::HostDesktopType last_activated_desktop_;
DISALLOW_COPY_AND_ASSIGN(ActiveDesktopMonitor);
};

Powered by Google App Engine
This is Rietveld 408576698