Refactor: Shelf Widget

ash/shell_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/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/root_window_layout_manager.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 using aura::RootWindow;
@@ skipping 19 matching lines @@
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_DesktopBackgroundContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_DefaultContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_AlwaysOnTopContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_PanelContainer));
   EXPECT_TRUE(Shell::GetContainer(
-      root_window, internal::kShellWindowId_LauncherContainer));
+      root_window, internal::kShellWindowId_ShelfContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_SystemModalContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_LockScreenBackgroundContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_LockScreenContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_LockSystemModalContainer));
   EXPECT_TRUE(Shell::GetContainer(
       root_window, internal::kShellWindowId_StatusContainer));
@@ skipping 206 matching lines @@
 #else
 #define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics
 #endif
 TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) {
   Shell* shell = Shell::GetInstance();
   Shell::TestApi test_api(shell);
 
   // We start with the usual window containers.
   ExpectAllContainers();
   // Launcher is visible.
-  views::Widget* launcher_widget = Launcher::ForPrimaryDisplay()->widget();
+  ShelfWidget* launcher_widget = Launcher::ForPrimaryDisplay()->shelf_widget();
   EXPECT_TRUE(launcher_widget->IsVisible());
   // Launcher is at bottom-left of screen.
   EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x());
   EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(),
             launcher_widget->GetWindowBoundsInScreen().bottom());
   // We have a desktop background but not a bare layer.
   // TODO (antrim): enable once we find out why it fails component build.
   //  internal::DesktopBackgroundWidgetController* background =
   //      Shell::GetPrimaryRootWindow()->
   //          GetProperty(internal::kWindowDesktopComponent);
@@ skipping 20 matching lines @@
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
   widget_params.bounds.SetRect(11, 22, 300, 400);
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
   EXPECT_FALSE(widget->IsMaximized());
 
   // Shelf defaults to visible.
   EXPECT_EQ(
       SHELF_VISIBLE,
-      Shell::GetPrimaryRootWindowController()->shelf()->visibility_state());
+      Shell::GetPrimaryRootWindowController()->
+          shelf_layout_manager()->visibility_state());
 
   // Fullscreen window hides it.
   widget->SetFullscreen(true);
   EXPECT_EQ(
       SHELF_HIDDEN,
-      Shell::GetPrimaryRootWindowController()->shelf()->visibility_state());
+      Shell::GetPrimaryRootWindowController()->
+          shelf_layout_manager()->visibility_state());
 
   // Restoring the window restores it.
   widget->Restore();
   EXPECT_EQ(
       SHELF_VISIBLE,
-      Shell::GetPrimaryRootWindowController()->shelf()->visibility_state());
+      Shell::GetPrimaryRootWindowController()->
+          shelf_layout_manager()->visibility_state());
 
   // Clean up.
   widget->Close();
 }
 
 namespace {
 
 // Builds the list of parents from |window| to the root. The returned vector is
 // in reverse order (|window| is first).
 std::vector<aura::Window*> BuildPathToRoot(aura::Window* window) {
@@ skipping 59 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash