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

Unified Diff: ash/shell.cc

Issue 9960042: Refactor screen/monitor so that gfx::Screen returns monitor object. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix command line Created 8 years, 8 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: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 955f01246a8d89cf3dced4ca2f0e6cd683e158a8..0a1a5767ff936331b2908ff469f60a230598b091 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -76,7 +76,7 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
#include "ui/aura/layout_manager.h"
-#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_aura.h"
#include "ui/aura/monitor_manager.h"
#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window.h"
@@ -847,7 +847,7 @@ void Shell::RotateFocus(Direction direction) {
void Shell::SetMonitorWorkAreaInsets(Window* contains,
const gfx::Insets& insets) {
- aura::Monitor* monitor = aura::Env::GetInstance()->monitor_manager()->
+ aura::MonitorAura* monitor = aura::Env::GetInstance()->monitor_manager()->
GetMonitorNearestWindow(contains);
if (monitor->work_area_insets() == insets)
return;

Powered by Google App Engine
This is Rietveld 408576698