Refactor: Shelf Widget

ash/focus_cycler_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/focus_cycler.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.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/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm/window_util.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/shell_factory.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
@@ skipping 28 matching lines @@
     ASSERT_TRUE(Launcher::ForPrimaryDisplay());
   }
 
   virtual void TearDown() OVERRIDE {
     if (tray_.get()) {
       GetStatusAreaWidgetDelegate(tray_->GetWidget())->
           SetFocusCyclerForTesting(NULL);
       tray_.reset();
     }
 
-    Launcher::ForPrimaryDisplay()->SetFocusCycler(NULL);
+    Launcher::ForPrimaryDisplay()->shelf_widget()->SetFocusCycler(NULL);

[Mr4D (OOO till 08-26), 2013/02/27 19:42:51]

Couldn't you use here "shelf_widget()" (as defined below)?

[Harry McCleave, 2013/03/01 04:31:19]

Done.

 
     focus_cycler_.reset();
 
     AshTestBase::TearDown();
   }
 
  protected:
   // Creates the system tray, returning true on success.
   bool CreateTray() {
     if (tray_.get())
@@ skipping 10 matching lines @@
     focus_cycler_->AddWidget(tray()->GetWidget());
     GetStatusAreaWidgetDelegate(tray_->GetWidget())->SetFocusCyclerForTesting(
         focus_cycler());
     return true;
   }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
   SystemTray* tray() { return tray_.get(); }
 
-  views::Widget* launcher_widget() {
-    return Launcher::ForPrimaryDisplay()->widget();
+  ShelfWidget* shelf_widget() {
+    return Launcher::ForPrimaryDisplay()->shelf_widget();
   }
 
-  void InstallFocusCycleOnLauncher() {
-    // Add the launcher
-    Launcher* launcher = Launcher::ForPrimaryDisplay();
-    launcher->SetFocusCycler(focus_cycler());
+  void InstallFocusCycleOnShelf() {
+    // Add the shelf.
+    shelf_widget()->SetFocusCycler(focus_cycler());
   }
 
  private:
   scoped_ptr<FocusCycler> focus_cycler_;
   scoped_ptr<SystemTray> tray_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusCyclerTest);
 };
 
 TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) {
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle the window
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusForward) {
   ASSERT_TRUE(CreateTray());
 
-  InstallFocusCycleOnLauncher();
+  InstallFocusCycleOnShelf();
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
-  // Cycle focus to the launcher
+  // Cycle focus to the shelf
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(launcher_widget()->IsActive());
+  EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusBackward) {
   ASSERT_TRUE(CreateTray());
 
-  InstallFocusCycleOnLauncher();
+  InstallFocusCycleOnShelf();
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the launcher
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(launcher_widget()->IsActive());
+  EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusForwardBackward) {
   ASSERT_TRUE(CreateTray());
 
-  InstallFocusCycleOnLauncher();
+  InstallFocusCycleOnShelf();
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
-  // Cycle focus to the launcher
+  // Cycle focus to the shelf
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(launcher_widget()->IsActive());
+  EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the launcher
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(launcher_widget()->IsActive());
+  EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusNoBrowser) {
   ASSERT_TRUE(CreateTray());
 
-  InstallFocusCycleOnLauncher();
+  InstallFocusCycleOnShelf();
 
   // Add the launcher and focus it
-  focus_cycler()->FocusWidget(launcher_widget());
+  focus_cycler()->FocusWidget(shelf_widget());
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
-  // Cycle focus to the launcher
+  // Cycle focus to the shelf
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
-  EXPECT_TRUE(launcher_widget()->IsActive());
+  EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the launcher
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
-  EXPECT_TRUE(launcher_widget()->IsActive());
+  EXPECT_TRUE(shelf_widget()->IsActive());
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 }
 
-TEST_F(FocusCyclerTest, Launcher_CycleFocusForward) {
+TEST_F(FocusCyclerTest, Shelf_CycleFocusForward) {
   ASSERT_TRUE(CreateTray());
-  InstallFocusCycleOnLauncher();
-  launcher_widget()->Hide();
+  InstallFocusCycleOnShelf();
+  shelf_widget()->Hide();
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
-TEST_F(FocusCyclerTest, Launcher_CycleFocusBackwardInvisible) {
+TEST_F(FocusCyclerTest, Shelf_CycleFocusBackwardInvisible) {
   ASSERT_TRUE(CreateTray());
-  InstallFocusCycleOnLauncher();
-  launcher_widget()->Hide();
+  InstallFocusCycleOnShelf();
+  shelf_widget()->Hide();
 
   // Create a single test window.
   scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace test
 }  // namespace ash