Refactor: Shelf Widget

ash/launcher/launcher_tooltip_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/launcher/launcher_tooltip_manager.h"
 
 #include "ash/root_window_controller.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/test/ash_test_base.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_util.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 13 matching lines @@
 class LauncherTooltipManagerTest : public AshTestBase {
  public:
   LauncherTooltipManagerTest() {}
   virtual ~LauncherTooltipManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     internal::RootWindowController* controller =
         Shell::GetPrimaryRootWindowController();
     tooltip_manager_.reset(new internal::LauncherTooltipManager(
-        controller->shelf(),
-        controller->launcher()->GetLauncherViewForTest()));
+        controller->shelf_layout_manager(),
+        controller->shelf()->launcher()->GetLauncherViewForTest()));
   }
 
   virtual void TearDown() OVERRIDE {
     tooltip_manager_.reset();
     AshTestBase::TearDown();
   }
 
   void ShowDelayed() {
     CreateWidget();
     tooltip_manager_->ShowDelayed(dummy_anchor_.get(), string16());
@@ skipping 29 matching lines @@
   void CreateWidget() {
     dummy_anchor_.reset(new views::View);
 
     widget_.reset(new views::Widget);
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.transparent = true;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.parent = Shell::GetContainer(
         Shell::GetPrimaryRootWindow(),
-        ash::internal::kShellWindowId_LauncherContainer);
+        ash::internal::kShellWindowId_ShelfContainer);
 
     widget_->Init(params);
     widget_->SetContentsView(dummy_anchor_.get());
   }
 
   DISALLOW_COPY_AND_ASSIGN(LauncherTooltipManagerTest);
 };
 
 TEST_F(LauncherTooltipManagerTest, ShowingBasics) {
   // ShowDelayed() should just start the timer instead of showing immediately.
@@ skipping 15 matching lines @@
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = CurrentContext();
   widget->Init(params);
   widget->SetFullscreen(true);
   widget->Show();
 
   // Once the shelf is hidden, the tooltip should be invisible.
   ASSERT_EQ(
       SHELF_HIDDEN,
-      Shell::GetPrimaryRootWindowController()->shelf()->visibility_state());
+      Shell::GetPrimaryRootWindowController()->
+          shelf_layout_manager()->visibility_state());
   EXPECT_FALSE(TooltipIsVisible());
 
   // Do not show the view if the shelf is hidden.
   ShowImmediately();
   EXPECT_FALSE(TooltipIsVisible());
 
   // ShowDelayed() doesn't even start the timer for the hidden shelf.
   ShowDelayed();
   EXPECT_FALSE(IsTimerRunning());
 }
 
 TEST_F(LauncherTooltipManagerTest, HideWhenShelfIsAutoHide) {
   // Create a visible window so auto-hide behavior is enforced.
   views::Widget* dummy = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.bounds = gfx::Rect(0, 0, 200, 200);
   params.context = CurrentContext();
   dummy->Init(params);
   dummy->Show();
 
   ShowImmediately();
   ASSERT_TRUE(TooltipIsVisible());
 
   internal::ShelfLayoutManager* shelf =
-      Shell::GetPrimaryRootWindowController()->shelf();
+      Shell::GetPrimaryRootWindowController()->shelf_layout_manager();
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   shelf->UpdateAutoHideState();
   ASSERT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
 
   // Tooltip visibility change for auto hide may take time.
   EXPECT_TRUE(TooltipIsVisible());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 
   // Do not show the view if the shelf is hidden.
@@ skipping 70 matching lines @@
   // Should hide if the mouse is out of the tooltip.
   test_api.set_location(tooltip_rect.origin() + gfx::Vector2d(-1, -1));
   event_handler->OnMouseEvent(&mouse_event);
   EXPECT_FALSE(mouse_event.handled());
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(TooltipIsVisible());
 }
 
 }  // namespace test
 }  // namespace ash