diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 08:45:04 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 08:45:04 +0000 |
| commit | b9329a6c9643cb4d4484d43e10664e418f79d721 (patch) | |
| tree | 754f064d63e64c75204cc36925a9b8208500234a /ui/aura/env.cc | |
| parent | 47092fc95c7980639f5ad5bab0e42f829ea97057 (diff) | |
| download | chromium_src-b9329a6c9643cb4d4484d43e10664e418f79d721.zip chromium_src-b9329a6c9643cb4d4484d43e10664e418f79d721.tar.gz chromium_src-b9329a6c9643cb4d4484d43e10664e418f79d721.tar.bz2 | |
relanding: disabled workspace_window_resizer test. fixed access-after-free.
* MonitorChangeObserverX11 that listen to Xrandr events and update monitor configurations.
* Message on secondary monitor view
* Accelerator to create/delete/cycle monitors to test multi monitor on linux desktop
* unittest for MultiMonitorManager/MonitorController
BUG=115510
TEST=multi_monitor_manager_unittests
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128330
Review URL: https://chromiumcodereview.appspot.com/9754001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/env.cc')
| -rw-r--r-- | ui/aura/env.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/aura/env.cc b/ui/aura/env.cc index 0e9222c..32ead2b 100644 --- a/ui/aura/env.cc +++ b/ui/aura/env.cc @@ -9,6 +9,10 @@ #include "ui/aura/window.h" #include "ui/gfx/compositor/compositor.h" +#if defined(USE_X11) +#include "ui/aura/monitor_change_observer_x11.h" +#endif + namespace aura { // static @@ -20,9 +24,11 @@ Env* Env::instance_ = NULL; Env::Env() : mouse_button_flags_(0), stacking_client_(NULL), - monitor_manager_(NULL) + monitor_manager_(new internal::SingleMonitorManager) +#if defined(USE_X11) + , monitor_change_observer_(new MonitorChangeObserverX11()) +#endif { - SetMonitorManager(new internal::SingleMonitorManager()); #if !defined(OS_MACOSX) dispatcher_.reset(CreateDispatcher()); #endif |