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

Unified Diff: ui/aura_shell/workspace/workspace_manager.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/workspace/workspace.cc ('k') | ui/aura_shell/workspace/workspace_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/workspace/workspace_manager.cc
===================================================================
--- ui/aura_shell/workspace/workspace_manager.cc (revision 113260)
+++ ui/aura_shell/workspace/workspace_manager.cc (working copy)
@@ -9,7 +9,7 @@
#include "base/auto_reset.h"
#include "base/logging.h"
#include "base/stl_util.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
#include "ui/aura/screen_aura.h"
#include "ui/aura/window.h"
#include "ui/aura_shell/workspace/workspace.h"
@@ -238,7 +238,7 @@
const gfx::Rect& workspace_bounds) {
gfx::Rect bounds = workspace_bounds;
bounds.Inset(
- aura::Desktop::GetInstance()->screen()->work_area_insets());
+ aura::RootWindow::GetInstance()->screen()->work_area_insets());
return bounds;
}
« no previous file with comments | « ui/aura_shell/workspace/workspace.cc ('k') | ui/aura_shell/workspace/workspace_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698