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

Unified Diff: ui/aura/screen_aura.cc

Issue 8771015: Rename Desktop->RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years 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
« no previous file with comments | « ui/aura/root_window_unittest.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/screen_aura.cc
===================================================================
--- ui/aura/screen_aura.cc (revision 113260)
+++ ui/aura/screen_aura.cc (working copy)
@@ -5,7 +5,7 @@
#include "ui/aura/screen_aura.h"
#include "base/logging.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/gfx/native_widget_types.h"
@@ -18,7 +18,7 @@
}
gfx::Point ScreenAura::GetCursorScreenPointImpl() {
- return Desktop::GetInstance()->last_mouse_location();
+ return RootWindow::GetInstance()->last_mouse_location();
}
gfx::Rect ScreenAura::GetMonitorWorkAreaNearestWindowImpl(
@@ -42,11 +42,11 @@
gfx::NativeWindow ScreenAura::GetWindowAtCursorScreenPointImpl() {
const gfx::Point point = GetCursorScreenPoint();
- return Desktop::GetInstance()->GetTopWindowContainingPoint(point);
+ return RootWindow::GetInstance()->GetTopWindowContainingPoint(point);
}
gfx::Rect ScreenAura::GetBounds() {
- return gfx::Rect(aura::Desktop::GetInstance()->GetHostSize());
+ return gfx::Rect(aura::RootWindow::GetInstance()->GetHostSize());
}
gfx::Rect ScreenAura::GetWorkAreaBounds() {
« no previous file with comments | « ui/aura/root_window_unittest.cc ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698