Refactor: Shelf Widget

ash/wm/workspace/workspace_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/workspace/workspace_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
+#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/activation_controller.h"
 #include "ash/wm/property_util.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace.h"
 #include "ash/wm/workspace_controller_test_helper.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
@@ skipping 41 matching lines @@
   }
 
   gfx::Rect GetFullscreenBounds(aura::Window* window) {
     return Shell::GetScreen()->GetDisplayNearestWindow(window).bounds();
   }
 
   Workspace* active_workspace() {
     return manager_->active_workspace_;
   }
 
+  ShelfWidget* shelf_widget() {
+    return Shell::GetPrimaryRootWindowController()->shelf();
+  }
+
   ShelfLayoutManager* shelf_layout_manager() {
-    return Shell::GetPrimaryRootWindowController()->shelf();
+    return Shell::GetPrimaryRootWindowController()->shelf_layout_manager();
   }
 
   bool GetWindowOverlapsShelf() {
     return shelf_layout_manager()->window_overlaps_shelf();
   }
 
   Workspace* FindBy(aura::Window* window) const {
     return manager_->FindBy(window);
   }
 
@@ skipping 717 matching lines @@
 // Verifies going from maximized to minimized sets the right state for painting
 // the background of the launcher.
 TEST_F(WorkspaceManagerTest, MinimizeResetsVisibility) {
   scoped_ptr<Window> w1(CreateTestWindow());
   w1->Show();
   wm::ActivateWindow(w1.get());
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MINIMIZED);
   EXPECT_EQ(SHELF_VISIBLE,
             shelf_layout_manager()->visibility_state());
-  EXPECT_FALSE(Launcher::ForPrimaryDisplay()->paints_background());
+  EXPECT_FALSE(shelf_widget()->paints_background());
 }
 
 // Verifies transients are moved when maximizing.
 TEST_F(WorkspaceManagerTest, MoveTransientOnMaximize) {
   scoped_ptr<Window> w1(CreateTestWindow());
   w1->Show();
   scoped_ptr<Window> w2(CreateTestWindow());
   w1->AddTransientChild(w2.get());
   w2->Show();
   wm::ActivateWindow(w1.get());
@@ skipping 124 matching lines @@
 
   // Create another window and maximize it.
   scoped_ptr<Window> w2(CreateTestWindow());
   w2->SetBounds(gfx::Rect(10, 11, 250, 251));
   w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   w2->Show();
   wm::ActivateWindow(w2.get());
 
   // Increase the size of the shelf. This would make |w1| fall completely out of
   // the display work area.
-  gfx::Size size(shelf->status_area_widget()->GetWindowBoundsInScreen().size());
+  gfx::Size size(shelf_widget()->status_area_widget()->
+      GetWindowBoundsInScreen().size());
   size.Enlarge(0, 30);
-  shelf->status_area_widget()->SetSize(size);
+  shelf_widget()->status_area_widget()->SetSize(size);
 
   // Switch to w1. The window should have moved.
   wm::ActivateWindow(w1.get());
   EXPECT_NE(w1_bounds.ToString(), w1->bounds().ToString());
 }
 
 // Verifies Focus() works in a window that isn't in the active workspace.
 TEST_F(WorkspaceManagerTest, FocusOnFullscreenInSeparateWorkspace) {
   scoped_ptr<Window> w1(CreateTestWindow());
   w1->SetBounds(gfx::Rect(10, 11, 250, 251));
@@ skipping 458 matching lines @@
   window2->layer()->GetAnimator()->StopAnimating();
   // |window1| should be flush right and |window2| flush left.
   EXPECT_EQ(base::IntToString(
                 desktop_area.width() - window1->bounds().width()) +
             ",32 640x320", window1->bounds().ToString());
   EXPECT_EQ("0,48 256x512", window2->bounds().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash