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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/aura_shell/workspace/workspace.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_shell/toplevel_window_event_filter_unittest.cc ('k') | ui/aura_shell/workspace/workspace_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/workspace/workspace.cc
===================================================================
--- ui/aura_shell/workspace/workspace.cc (revision 113260)
+++ ui/aura_shell/workspace/workspace.cc (working copy)
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/window.h"
#include "ui/aura_shell/property_util.h"
#include "ui/aura_shell/workspace/workspace_manager.h"
@@ -95,7 +95,7 @@
aura::Window* Workspace::FindRotateWindowForLocation(
const gfx::Point& position) {
- aura::Window* active = aura::Desktop::GetInstance()->active_window();
+ aura::Window* active = aura::RootWindow::GetInstance()->active_window();
if (GetTotalWindowsWidth() < bounds_.width()) {
// If all windows fit to the width of the workspace, it returns the
// window which contains |position|'s x coordinate.
« no previous file with comments | « ui/aura_shell/toplevel_window_event_filter_unittest.cc ('k') | ui/aura_shell/workspace/workspace_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698