Rename Launcher to Shelf.

ash/accelerators/accelerator_controller.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/accelerators/accelerator_controller.h"
 
 #include <algorithm>
 #include <cmath>
 #include <iostream>
 #include <string>
 
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accelerators/debug_commands.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/debug.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime_control_delegate.h"
-#include "ash/launcher/launcher.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/media_delegate.h"
 #include "ash/multi_profile_uma.h"
 #include "ash/new_window_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/session_state_delegate.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness_control_delegate.h"
 #include "ash/system/keyboard_brightness/keyboard_brightness_control_delegate.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 148 matching lines @@
     shell->caps_lock_delegate()->SetCapsLockEnabled(false);
     return true;
   }
   return false;
 }
 
 bool HandleFocusLauncher() {
   Shell* shell = Shell::GetInstance();
   content::RecordAction(content::UserMetricsAction("Accel_Focus_Launcher"));
   return shell->focus_cycler()->FocusWidget(
-      Launcher::ForPrimaryDisplay()->shelf_widget());
+      Shelf::ForPrimaryDisplay()->shelf_widget());
 }
 
 bool HandleLaunchAppN(int n) {
   content::RecordAction(UserMetricsAction("Accel_Launch_App"));
-  Launcher::ForPrimaryDisplay()->LaunchAppIndexAt(n);
+  Shelf::ForPrimaryDisplay()->LaunchAppIndexAt(n);
   return true;
 }
 
 bool HandleLaunchLastApp() {
   content::RecordAction(UserMetricsAction("Accel_Launch_Last_App"));
-  Launcher::ForPrimaryDisplay()->LaunchAppIndexAt(-1);
+  Shelf::ForPrimaryDisplay()->LaunchAppIndexAt(-1);
   return true;
 }
 
 // Magnify the screen
 bool HandleMagnifyScreen(int delta_index) {
   if (ash::Shell::GetInstance()->magnification_controller()->IsEnabled()) {
     // TODO(yoshiki): Move the following logic to MagnificationController.
     float scale =
         ash::Shell::GetInstance()->magnification_controller()->GetScale();
     // Calculate rounded logarithm (base kMagnificationScaleFactor) of scale.
@@ skipping 984 matching lines @@
     keyboard_brightness_control_delegate) {
   keyboard_brightness_control_delegate_ =
       keyboard_brightness_control_delegate.Pass();
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash