Refactor: Shelf Widget

chrome/browser/ui/views/immersive_mode_controller_browsertest.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 "chrome/browser/ui/views/immersive_mode_controller.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 
 #if defined(USE_ASH)
 #include "ash/root_window_controller.h"
-#include "ash/shelf_types.h"
+#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
-#include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_properties.h"
 #endif
 
 namespace {
 
 // Returns the bounds of |view| in widget coordinates.
 gfx::Rect GetRectInWidget(views::View* view) {
   return view->ConvertRectToWidget(view->GetLocalBounds());
 }
 
@@ skipping 176 matching lines @@
 // Shelf-specific immersive mode tests.
 IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerTest, ImmersiveShelf) {
   ui::LayerAnimator::set_disable_animations_for_test(true);
 
   BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
   ImmersiveModeController* immersive_controller =
       browser_view->immersive_mode_controller();
 
   // Shelf is visible when the test starts.
   ash::internal::ShelfLayoutManager* shelf =
-      ash::Shell::GetPrimaryRootWindowController()->shelf();
+      ash::Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
   ASSERT_EQ(ash::SHELF_VISIBLE, shelf->visibility_state());
 
   // Turning immersive mode on sets the shelf to auto-hide.
   immersive_controller->SetEnabledForTest(true);
   chrome::ToggleFullscreenMode(browser());
   ASSERT_TRUE(browser_view->IsFullscreen());
   EXPECT_EQ(ash::SHELF_AUTO_HIDE, shelf->visibility_state());
 
   // Disabling immersive mode puts it back.
   immersive_controller->SetEnabledForTest(false);
@@ skipping 20 matching lines @@
   // Setting the window property directly toggles immersive mode.
   // TODO(jamescook): Is this functionality still needed?
   aura::Window* window = browser_view->GetWidget()->GetNativeWindow();
   window->SetProperty(ash::internal::kImmersiveModeKey, true);
   EXPECT_TRUE(immersive_controller->enabled());
   window->SetProperty(ash::internal::kImmersiveModeKey, false);
   EXPECT_FALSE(immersive_controller->enabled());
 }
 
 #endif  // defined(OS_CHROMEOS)