Rename Launcher to Shelf.

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.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
+#include "ash/shell_factory.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/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
-#include "ash/test/ash_test_base.h"
-#include "ash/shell_factory.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
@@ skipping 39 matching lines @@
 
 class FocusCyclerTest : public AshTestBase {
  public:
   FocusCyclerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
 
     focus_cycler_.reset(new FocusCycler());
 
-    ASSERT_TRUE(Launcher::ForPrimaryDisplay());
+    ASSERT_TRUE(Shelf::ForPrimaryDisplay());
   }
 
   virtual void TearDown() OVERRIDE {
     if (tray_) {
       GetStatusAreaWidgetDelegate(tray_->GetWidget())->
           SetFocusCyclerForTesting(NULL);
       tray_.reset();
     }
 
     shelf_widget()->SetFocusCycler(NULL);
@@ skipping 21 matching lines @@
     GetStatusAreaWidgetDelegate(tray_->GetWidget())->SetFocusCyclerForTesting(
         focus_cycler());
     return true;
   }
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
   SystemTray* tray() { return tray_.get(); }
 
   ShelfWidget* shelf_widget() {
-    return Launcher::ForPrimaryDisplay()->shelf_widget();
+    return Shelf::ForPrimaryDisplay()->shelf_widget();
   }
 
   void InstallFocusCycleOnShelf() {
     // Add the shelf.
     shelf_widget()->SetFocusCycler(focus_cycler());
   }
 
  private:
   scoped_ptr<FocusCycler> focus_cycler_;
   scoped_ptr<SystemTray> tray_;
@@ skipping 263 matching lines @@
   // should do the same thing.
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(shelf_widget()->IsActive());
   event_generator.PressKey(ui::VKEY_ESCAPE, 0);
   EXPECT_TRUE(wm::IsActiveWindow(browser_window));
   EXPECT_EQ(focus_manager->GetFocusedView(), view1);
 }
 
 }  // namespace test
 }  // namespace ash