* MultiMonitorManager creates and manages mutliple monitor instance

* MonitorContrler controls root window <-> monitor mapping and resize/reposition root window to match monitor configuration.
* Moved use_fullscreen_host_window to MonitorManager
* Moved compositor initialize/terminate to Env as there can be more than one root window.

BUG=115510
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9701098

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127854 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 10 insertions, 11 deletions

diff --git a/chrome/browser/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/chrome_browser_main_extra_parts_ash.cc
index 950bc0a..0b862e9 100644
--- a/chrome/browser/chrome_browser_main_extra_parts_ash.cc
+++ b/chrome/browser/chrome_browser_main_extra_parts_ash.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"
 #include "ui/aura/env.h"
 #include "ui/aura/aura_switches.h"
+#include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/compositor/compositor_setup.h"
 
@@ -34,10 +35,11 @@ ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh()
 
 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
 #if defined(OS_CHROMEOS)
+  aura::MonitorManager::set_use_fullscreen_host_window(true);
   if (base::chromeos::IsRunningOnChromeOS() ||
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAuraHostWindowUseFullscreen)) {
-    aura::RootWindow::set_use_fullscreen_host_window(true);
+    aura::MonitorManager::set_use_fullscreen_host_window(true);
     aura::RootWindow::set_hide_host_cursor(true);
     // Hide the mouse cursor completely at boot.
     if (!chromeos::UserManager::Get()->IsUserLoggedIn())
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index fb02d39..02bf905 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -345,14 +345,14 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
 #endif
 
-#if defined(USE_AURA)
-  main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
-#endif
-
 #if defined(USE_ASH)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
 #endif
 
+#if defined(USE_AURA)
+  main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
+#endif
+
   return main_parts;
 }
 
diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
index 1ac858a..01ee4a5 100644
--- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc
@@ -25,7 +25,6 @@
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(USE_AURA)
-#include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_screen.h"
@@ -127,8 +126,8 @@ class AccessibilityEventRouterViewsTest
   virtual void SetUp() {
     views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate();
 #if defined(USE_AURA)
-    root_window_.reset(aura::Env::GetInstance()->monitor_manager()->
-                       CreateRootWindowForPrimaryMonitor());
+    root_window_.reset(
+        aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
     gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
     test_stacking_client_.reset(
         new aura::test::TestStackingClient(root_window_.get()));
diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
index e03cce5..d4234d9 100644
--- a/chrome/test/base/browser_with_test_window_test.cc
+++ b/chrome/test/base/browser_with_test_window_test.cc
@@ -16,7 +16,6 @@
 #include "content/test/test_renderer_host.h"
 
 #if defined(USE_AURA)
-#include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_activation_client.h"
@@ -45,8 +44,7 @@ void BrowserWithTestWindowTest::SetUp() {
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 #if defined(USE_AURA)
-  root_window_.reset(aura::Env::GetInstance()->monitor_manager()->
-                     CreateRootWindowForPrimaryMonitor());
+  root_window_.reset(aura::MonitorManager::CreateRootWindowForPrimaryMonitor());
   gfx::Screen::SetInstance(new aura::TestScreen(root_window_.get()));
   test_activation_client_.reset(
       new aura::test::TestActivationClient(root_window_.get()));