MonitorManager to manage multiple monitors.

ash/wm/shelf_layout_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/shelf_layout_manager.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
+#include "ui/aura/env.h"
+#include "ui/aura/monitor.h"
+#include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/animation_container_element.h"
 #include "ui/gfx/compositor/layer_animator.h"
 #include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 void StepWidgetLayerAnimatorToEnd(views::Widget* widget) {
   ui::AnimationContainerElement* element =
       static_cast<ui::AnimationContainerElement*>(
@@ skipping 16 matching lines @@
 #define MAYBE_SetVisible FAILS_SetVisible
 #else
 #define MAYBE_SetVisible SetVisible
 #endif
 // Makes sure SetVisible updates work area and widget appropriately.
 TEST_F(ShelfLayoutManagerTest, MAYBE_SetVisible) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   // Force an initial layout.
   shelf->LayoutShelf();
   ASSERT_TRUE(shelf->visible());
-
-  const ash::ScreenAsh* screen = Shell::GetInstance()->screen();
-  ASSERT_TRUE(screen);
+  const aura::MonitorManager* manager =
+      aura::Env::GetInstance()->monitor_manager();
+  const aura::Monitor* monitor =
+      manager->GetMonitorNearestWindow(Shell::GetRootWindow());
+  ASSERT_TRUE(monitor);
   // Bottom inset should be the max of widget heights.
   EXPECT_EQ(shelf->max_height() + ShelfLayoutManager::kWorkspaceAreaBottomInset,
-            screen->work_area_insets().bottom());
+            monitor->work_area_insets().bottom());
 
   // Hide the shelf.
   shelf->SetVisible(false);
   // Run the animation to completion.
   StepWidgetLayerAnimatorToEnd(shelf->launcher());
   StepWidgetLayerAnimatorToEnd(shelf->status());
   EXPECT_FALSE(shelf->visible());
-  EXPECT_EQ(0, screen->work_area_insets().bottom());
+  EXPECT_EQ(0, monitor->work_area_insets().bottom());
 
   // Make sure the bounds of the two widgets changed.
   EXPECT_GE(shelf->launcher()->GetNativeView()->bounds().y(),
             gfx::Screen::GetPrimaryMonitorBounds().bottom());
   EXPECT_GE(shelf->status()->GetNativeView()->bounds().y(),
             gfx::Screen::GetPrimaryMonitorBounds().bottom());
 
   // And show it again.
   shelf->SetVisible(true);
   // Run the animation to completion.
   StepWidgetLayerAnimatorToEnd(shelf->launcher());
   StepWidgetLayerAnimatorToEnd(shelf->status());
   EXPECT_TRUE(shelf->visible());
   EXPECT_EQ(shelf->max_height() + ShelfLayoutManager::kWorkspaceAreaBottomInset,
-            screen->work_area_insets().bottom());
+            monitor->work_area_insets().bottom());
 
   // Make sure the bounds of the two widgets changed.
   gfx::Rect launcher_bounds(shelf->launcher()->GetNativeView()->bounds());
   int bottom = gfx::Screen::GetPrimaryMonitorBounds().bottom() -
       shelf->max_height();
   EXPECT_EQ(launcher_bounds.y(),
             bottom + (shelf->max_height() - launcher_bounds.height()) / 2);
   gfx::Rect status_bounds(shelf->status()->GetNativeView()->bounds());
   EXPECT_EQ(status_bounds.y(),
             bottom + shelf->max_height() - status_bounds.height());
 }
 
 // Makes sure LayoutShelf invoked while animating cleans things up.
 TEST_F(ShelfLayoutManagerTest, LayoutShelfWhileAnimating) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   // Force an initial layout.
   shelf->LayoutShelf();
   ASSERT_TRUE(shelf->visible());
 
-  const ash::ScreenAsh* screen = Shell::GetInstance()->screen();
+  const aura::MonitorManager* manager =
+      aura::Env::GetInstance()->monitor_manager();
+  const aura::Monitor* monitor =
+      manager->GetMonitorNearestWindow(Shell::GetRootWindow());

[Ben Goodger (Google), 2012/03/14 17:01:26]

I suspect we'll want some convenience function that automates this, probably in
aura. Can we define in the aura namespace:

GetMonitorNearestWindow(aura::Window* window) with these lines in it, and just
call it from places like this?

[oshima, 2012/03/14 17:19:43]

I'm thinking of refacotring gfx::Screen to return monitor, replaces
GetMonitorXXXNearestYYY with GetMonitorNearestYYY()->GetXXX().
That is, this will be

const ui::Monitor* monitor = gfx::Screen::GetMonitorNearestWindow(window);

Since this requires changes to all platforms, I'd like to do it in separate CL. 
Let me know what you think.

 
   // Hide the shelf.
   shelf->SetVisible(false);
   shelf->LayoutShelf();
   EXPECT_FALSE(shelf->visible());
   EXPECT_FALSE(shelf->visible());
-  EXPECT_EQ(0, screen->work_area_insets().bottom());
+  EXPECT_EQ(0, monitor->work_area_insets().bottom());
   // Make sure the bounds of the two widgets changed.
   EXPECT_GE(shelf->launcher()->GetNativeView()->bounds().y(),
             gfx::Screen::GetPrimaryMonitorBounds().bottom());
   EXPECT_GE(shelf->status()->GetNativeView()->bounds().y(),
             gfx::Screen::GetPrimaryMonitorBounds().bottom());
 }
 
 // Makes sure the launcher is initially sized correctly.
 TEST_F(ShelfLayoutManagerTest, LauncherInitiallySized) {
   Launcher* launcher = Shell::GetInstance()->launcher();
@@ skipping 25 matching lines @@
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
   // Widget is now owned by the parent window.
   widget->Init(params);
   widget->SetFullscreen(true);
 }
 
 }  // namespace internal
 }  // namespace ash