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

Unified Diff: ui/aura/env.cc

Issue 9699013: MonitorManager to manage multiple monitors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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: ui/aura/env.cc
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 30b8b38ffc8951fe0f8329e1f19719cab72105d1..006400f9ebe625d5b0d3602a9776aba799e3dbd5 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -4,6 +4,7 @@
#include "ui/aura/env.h"
#include "ui/aura/env_observer.h"
+#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window_host.h"
#include "ui/aura/window.h"
@@ -15,7 +16,11 @@ Env* Env::instance_ = NULL;
////////////////////////////////////////////////////////////////////////////////
// Env, public:
-Env::Env() : mouse_button_flags_(0), stacking_client_(NULL) {
+Env::Env()
+ : mouse_button_flags_(0),
+ stacking_client_(NULL),
+ monitor_manager_(NULL)
+{
#if !defined(OS_MACOSX)
dispatcher_.reset(CreateDispatcher());
#endif
@@ -44,6 +49,10 @@ void Env::RemoveObserver(EnvObserver* observer) {
observers_.RemoveObserver(observer);
}
+void Env::SetMonitorManager(MonitorManager* monitor_manager) {
+ monitor_manager_.reset(monitor_manager);
+}
+
#if !defined(OS_MACOSX)
MessageLoop::Dispatcher* Env::GetDispatcher() {
return dispatcher_.get();
« ash/wm/shelf_layout_manager_unittest.cc ('K') | « ui/aura/env.h ('k') | ui/aura/monitor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698