[Launcher per display] Removed Shell::status_area_widget(), system_tray()

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/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 31 matching lines @@
 namespace {
 
 void StepWidgetLayerAnimatorToEnd(views::Widget* widget) {
   ui::AnimationContainerElement* element =
       static_cast<ui::AnimationContainerElement*>(
       widget->GetNativeView()->layer()->GetAnimator());
   element->Step(base::TimeTicks::Now() + base::TimeDelta::FromSeconds(1));
 }
 
 ShelfLayoutManager* GetShelfLayoutManager() {
-  aura::Window* window = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_LauncherContainer);
-  return static_cast<ShelfLayoutManager*>(window->layout_manager());
+  return Shell::GetPrimaryRootWindowController()->shelf();
+}
+
+SystemTray* GetSystemTray() {
+  return Shell::GetPrimaryRootWindowController()->GetSystemTray();
 }
 
 class ShelfLayoutObserverTest : public ShelfLayoutManager::Observer {
  public:
   ShelfLayoutObserverTest()
       : changed_auto_hide_state_(false) {
   }
 
   virtual ~ShelfLayoutObserverTest() {}
 
   bool changed_auto_hide_state() const { return changed_auto_hide_state_; }
 
  private:
   virtual void OnAutoHideStateChanged(
       ShelfAutoHideState new_state) OVERRIDE {
     changed_auto_hide_state_ = true;
   }
 
   bool changed_auto_hide_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutObserverTest);
 };
 
 // Trivial item implementation that tracks its views for testing.
 class TestItem : public SystemTrayItem {
  public:
   TestItem()
-      : SystemTrayItem(Shell::GetInstance()->system_tray()),
+      : SystemTrayItem(GetSystemTray()),
         tray_view_(NULL),
         default_view_(NULL),
         detailed_view_(NULL),
         notification_view_(NULL) {}
 
   virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE {
     tray_view_ = new views::View;
     // Add a label so it has non-zero width.
     tray_view_->SetLayoutManager(new views::FillLayout);
     tray_view_->AddChildView(new views::Label(UTF8ToUTF16("Tray")));
@@ skipping 52 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestItem);
 };
 
 }  // namespace
 
 class ShelfLayoutManagerTest : public ash::test::AshTestBase {
  public:
   ShelfLayoutManagerTest() {}
 
-  ShelfLayoutManager* shelf_layout_manager() {
-    return Shell::GetPrimaryRootWindowController()->shelf();
-  }
-
   void SetState(ShelfLayoutManager* shelf,
                 ShelfVisibilityState state) {
     shelf->SetState(state);
   }
 
   void UpdateAutoHideStateNow() {
     GetShelfLayoutManager()->UpdateAutoHideStateNow();
   }
 
   aura::Window* CreateTestWindow() {
@@ skipping 333 matching lines @@
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
 }
 
 // Makes sure shelf will be visible when app list opens as shelf is in
 // SHELF_VISIBLE state,and toggling app list won't change shelf
 // visibility state.
 TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfVisibleState) {
   Shell* shell = Shell::GetInstance();
   internal::RootWindowController* controller =
       Shell::GetPrimaryRootWindowController();
-  ShelfLayoutManager* shelf = shelf_layout_manager();
+  ShelfLayoutManager* shelf = GetShelfLayoutManager();
   shelf->LayoutShelf();
   controller->SetShelfAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
 
   // Create a normal unmaximized windowm shelf should be visible.
   aura::Window* window = CreateTestWindow();
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   window->Show();
   EXPECT_FALSE(shell->GetAppListTargetVisibility());
   EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
 
   // Toggle app list to show, and the shelf stays visible.
   shell->ToggleAppList();
   EXPECT_TRUE(shell->GetAppListTargetVisibility());
   EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
 
   // Toggle app list to hide, and the shelf stays visible.
   shell->ToggleAppList();
   EXPECT_FALSE(shell->GetAppListTargetVisibility());
   EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
 }
 
 // Makes sure shelf will be shown with SHELF_AUTO_HIDE_SHOWN state
 // when app list opens as shelf is in SHELF_AUTO_HIDE state, and
 // toggling app list won't change shelf visibility state.
 TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfAutoHideState) {
   Shell* shell = Shell::GetInstance();
-  ShelfLayoutManager* shelf = shelf_layout_manager();
+  ShelfLayoutManager* shelf = GetShelfLayoutManager();
   internal::RootWindowController* controller =
       Shell::GetPrimaryRootWindowController();
   shelf->LayoutShelf();
   controller->SetShelfAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
 
   // Create a window and show it in maximized state.
   aura::Window* window = CreateTestWindow();
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   window->Show();
@@ skipping 15 matching lines @@
   // Toggle app list to hide.
   shell->ToggleAppList();
   EXPECT_FALSE(shell->GetAppListTargetVisibility());
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
 }
 
 // Makes sure shelf will be hidden when app list opens as shelf is in HIDDEN
 // state, and toggling app list won't change shelf visibility state.
 TEST_F(ShelfLayoutManagerTest, OpenAppListWithShelfHiddenState) {
   Shell* shell = Shell::GetInstance();
-  ShelfLayoutManager* shelf = shelf_layout_manager();
+  ShelfLayoutManager* shelf = GetShelfLayoutManager();
   // For shelf to be visible, app list is not open in initial state.
   shelf->LayoutShelf();
 
   // Create a window and make it full screen.
   aura::Window* window = CreateTestWindow();
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   window->Show();
   wm::ActivateWindow(window);
 
   // App list and shelf is not shown.
   EXPECT_FALSE(shell->GetAppListTargetVisibility());
   EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
 
   // Toggle app list to show.
   shell->ToggleAppList();
   EXPECT_TRUE(shell->GetAppListTargetVisibility());
   EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
 
   // Toggle app list to hide.
   shell->ToggleAppList();
   EXPECT_FALSE(shell->GetAppListTargetVisibility());
   EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
 }
 
 // Tests SHELF_ALIGNMENT_LEFT and SHELF_ALIGNMENT_RIGHT.
 TEST_F(ShelfLayoutManagerTest, SetAlignment) {
-  ShelfLayoutManager* shelf = shelf_layout_manager();
+  ShelfLayoutManager* shelf = GetShelfLayoutManager();
   // Force an initial layout.
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   shelf->LayoutShelf();
   EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
 
   shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
   gfx::Rect launcher_bounds(
       shelf->launcher_widget()->GetWindowBoundsInScreen());
   const internal::DisplayManager* manager =
       Shell::GetInstance()->display_manager();
   gfx::Display display =
       manager->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   ASSERT_NE(-1, display.id());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             display.GetWorkAreaInsets().left());
   EXPECT_GE(
       launcher_bounds.width(),
       shelf->launcher_widget()->GetContentsView()->GetPreferredSize().width());
-  EXPECT_EQ(SHELF_ALIGNMENT_LEFT,
-            Shell::GetInstance()->system_tray()->shelf_alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_LEFT, GetSystemTray()->shelf_alignment());
   StatusAreaWidget* status_area_widget = shelf->status_area_widget();
   gfx::Rect status_bounds(status_area_widget->GetWindowBoundsInScreen());
   EXPECT_GE(status_bounds.width(),
             status_area_widget->GetContentsView()->GetPreferredSize().width());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             display.GetWorkAreaInsets().left());
   EXPECT_EQ(0, display.GetWorkAreaInsets().top());
   EXPECT_EQ(0, display.GetWorkAreaInsets().bottom());
   EXPECT_EQ(0, display.GetWorkAreaInsets().right());
   EXPECT_EQ(display.bounds().x(), launcher_bounds.x());
   EXPECT_EQ(display.bounds().y(), launcher_bounds.y());
   EXPECT_EQ(display.bounds().height(), launcher_bounds.height());
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   display = manager->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   EXPECT_EQ(ShelfLayoutManager::kAutoHideSize,
       display.GetWorkAreaInsets().left());
   EXPECT_EQ(ShelfLayoutManager::kAutoHideSize, display.work_area().x());
 
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
   display = manager->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   launcher_bounds = shelf->launcher_widget()->GetWindowBoundsInScreen();
   display = manager->GetDisplayNearestWindow(Shell::GetPrimaryRootWindow());
   ASSERT_NE(-1, display.id());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             display.GetWorkAreaInsets().right());
   EXPECT_GE(launcher_bounds.width(),
       shelf->launcher_widget()->GetContentsView()->GetPreferredSize().width());
-  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT,
-            Shell::GetInstance()->system_tray()->shelf_alignment());
+  EXPECT_EQ(SHELF_ALIGNMENT_RIGHT, GetSystemTray()->shelf_alignment());
   status_bounds = gfx::Rect(status_area_widget->GetWindowBoundsInScreen());
   EXPECT_GE(status_bounds.width(),
             status_area_widget->GetContentsView()->GetPreferredSize().width());
   EXPECT_EQ(shelf->GetIdealBounds().width(),
             display.GetWorkAreaInsets().right());
   EXPECT_EQ(0, display.GetWorkAreaInsets().top());
   EXPECT_EQ(0, display.GetWorkAreaInsets().bottom());
   EXPECT_EQ(0, display.GetWorkAreaInsets().left());
   EXPECT_EQ(display.work_area().right(), launcher_bounds.x());
   EXPECT_EQ(display.bounds().y(), launcher_bounds.y());
@@ skipping 105 matching lines @@
   EXPECT_EQ(SHELF_HIDDEN, shelf->visibility_state());
   EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
   EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
 }
 
 TEST_F(ShelfLayoutManagerTest, GestureRevealsTrayBubble) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   shelf->LayoutShelf();
 
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  SystemTray* tray = Shell::GetInstance()->system_tray();
+  SystemTray* tray = GetSystemTray();
 
   // First, make sure the shelf is visible.
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   EXPECT_FALSE(tray->HasSystemBubble());
 
   // Now, drag up on the tray to show the bubble.
   gfx::Point start =
       shelf->status_area_widget()->GetWindowBoundsInScreen().CenterPoint();
   gfx::Point end(start.x(), start.y() - 100);
   generator.GestureScrollSequence(start, end,
@@ skipping 29 matching lines @@
   // Turn on auto-hide for the shelf.
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
 
   // Show the status menu. That should make the shelf visible again.
   Shell::GetInstance()->accelerator_controller()->PerformAction(
       SHOW_SYSTEM_TRAY_BUBBLE, ui::Accelerator());
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
-  EXPECT_TRUE(Shell::GetInstance()->system_tray()->HasSystemBubble());
+  EXPECT_TRUE(GetSystemTray()->HasSystemBubble());
 
   // Now activate the tray (using the keyboard, instead of using the mouse to
   // make sure the mouse does not alter the auto-hide state in the shelf).
   // This should not trigger any auto-hide state change in the shelf.
   ShelfLayoutObserverTest observer;
   shelf->AddObserver(&observer);
 
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   generator.PressKey(ui::VKEY_SPACE, 0);
   generator.ReleaseKey(ui::VKEY_SPACE, 0);
-  EXPECT_TRUE(Shell::GetInstance()->system_tray()->HasSystemBubble());
+  EXPECT_TRUE(GetSystemTray()->HasSystemBubble());
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
   EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state());
   EXPECT_FALSE(observer.changed_auto_hide_state());
 
   shelf->RemoveObserver(&observer);
 }
 
 TEST_F(ShelfLayoutManagerTest, WorkAreaChangeWorkspace) {
   // Make sure the shelf is always visible.
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
@@ skipping 42 matching lines @@
   // Activate the first window. Now, both windows should be of the same size
   // again.
   widget_two->Activate();
   EXPECT_EQ(widget_one->GetNativeWindow()->bounds().ToString(),
             widget_two->GetNativeWindow()->bounds().ToString());
 }
 
 // Confirm that the shelf is dimmed only when content is maximized and
 // shelf is not autohidden.
 TEST_F(ShelfLayoutManagerTest, Dimming) {
-  shelf_layout_manager()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
+  GetShelfLayoutManager()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   scoped_ptr<aura::Window> w1(CreateTestWindow());
   w1->Show();
   wm::ActivateWindow(w1.get());
 
   // Normal window doesn't dim shelf.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   EXPECT_FALSE(launcher->GetDimsShelf());
 
   // Maximized window does.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_TRUE(launcher->GetDimsShelf());
 
   // Change back to normal stops dimming.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_FALSE(launcher->GetDimsShelf());
 
   // Changing back to maximized dims again.
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   EXPECT_TRUE(launcher->GetDimsShelf());
 
   // Changing shelf to autohide stops dimming.
-  shelf_layout_manager()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+  GetShelfLayoutManager()->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_FALSE(launcher->GetDimsShelf());
 }
 
 // Make sure that the shelf will not hide if the mouse is between a bubble and
 // the shelf.
 TEST_F(ShelfLayoutManagerTest, BubbleEnlargesShelfMouseHitArea) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
   StatusAreaWidget* status_area_widget =
       Shell::GetPrimaryRootWindowController()->status_area_widget();
-  SystemTray* tray = Shell::GetInstance()->system_tray();
+  SystemTray* tray = GetSystemTray();
 
   shelf->LayoutShelf();
   aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   // Make two iterations - first without a message bubble which should make
   // the shelf disappear and then with a message bubble which should keep it
   // visible.
   for (int i = 0; i < 2; i++) {
     // Make sure the shelf is visible and position the mouse over it. Then
     // allow auto hide.
@@ skipping 24 matching lines @@
       EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
     } else {
       EXPECT_FALSE(shelf->IsVisible());
       EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash