diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:30:15 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:30:15 +0000 |
| commit | 7d733b43e51d53a70e5e8062e485b5cd533c25a8 (patch) | |
| tree | 9e4001a80c9ccec8f7e5501555f924503f39387b /ui/aura/env.cc | |
| parent | 32793338010caebb42a4f32801b025c26be388fd (diff) | |
| download | chromium_src-7d733b43e51d53a70e5e8062e485b5cd533c25a8.zip chromium_src-7d733b43e51d53a70e5e8062e485b5cd533c25a8.tar.gz chromium_src-7d733b43e51d53a70e5e8062e485b5cd533c25a8.tar.bz2 | |
Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-after-free."
This causes a black screen on Alex when building from ToT chrome.
BUG=chromium-os:28304
TBR=oshima
TEST=can log in on Alex
Review URL: https://chromiumcodereview.appspot.com/9838060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/env.cc')
| -rw-r--r-- | ui/aura/env.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ui/aura/env.cc b/ui/aura/env.cc index 32ead2b..0e9222c 100644 --- a/ui/aura/env.cc +++ b/ui/aura/env.cc @@ -9,10 +9,6 @@ #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 @@ -24,11 +20,9 @@ Env* Env::instance_ = NULL; Env::Env() : mouse_button_flags_(0), stacking_client_(NULL), - monitor_manager_(new internal::SingleMonitorManager) -#if defined(USE_X11) - , monitor_change_observer_(new MonitorChangeObserverX11()) -#endif + monitor_manager_(NULL) { + SetMonitorManager(new internal::SingleMonitorManager()); #if !defined(OS_MACOSX) dispatcher_.reset(CreateDispatcher()); #endif |