summaryrefslogtreecommitdiffstats
path: root/ui/aura/env.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-30 16:28:59 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-30 16:28:59 +0000
commit6b0d410f93c51862e219ecb50eed2065ab952f71 (patch)
treea76b708e4e87aee959394b159a130e9ed77c2a2e /ui/aura/env.cc
parentd5eb9eda038370b612940244780929a8557213f1 (diff)
downloadchromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.zip
chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.tar.gz
chromium_src-6b0d410f93c51862e219ecb50eed2065ab952f71.tar.bz2
Don't set single monitor manager under multi monitor environment.
BUG=28581 TEST=none Review URL: https://chromiumcodereview.appspot.com/9923027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129867 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/env.cc')
-rw-r--r--ui/aura/env.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 6da06ef..747c74c 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -4,7 +4,7 @@
#include "ui/aura/env.h"
#include "ui/aura/env_observer.h"
-#include "ui/aura/single_monitor_manager.h"
+#include "ui/aura/monitor_manager.h"
#include "ui/aura/root_window_host.h"
#include "ui/aura/window.h"
#include "ui/gfx/compositor/compositor.h"
@@ -77,7 +77,6 @@ void Env::Init() {
#if defined(USE_X11)
monitor_change_observer_.reset(new internal::MonitorChangeObserverX11);
#endif
- SetMonitorManager(new internal::SingleMonitorManager);
ui::Compositor::Initialize(false);
}