Rename Launcher to Shelf.

ash/root_window_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/root_window_controller.h"
 
 #include <queue>
 #include <vector>
 
 #include "ash/ash_constants.h"
@@ skipping 251 matching lines @@
 }
 
 void RootWindowController::CreateForVirtualKeyboardDisplay(
     aura::RootWindow * root) {
   RootWindowController* controller = new RootWindowController(root);
   controller->Init(RootWindowController::VIRTUAL_KEYBOARD,
                    false /* first run */);
 }
 
 // static
-RootWindowController* RootWindowController::ForLauncher(aura::Window* window) {
+RootWindowController* RootWindowController::ForShelf(aura::Window* window) {
   return GetRootWindowController(window->GetRootWindow());
 }
 
 // static
 RootWindowController* RootWindowController::ForWindow(
     const aura::Window* window) {
   return GetRootWindowController(window->GetRootWindow());
 }
 
 // static
@@ skipping 84 matching lines @@
 }
 
 aura::Window* RootWindowController::GetContainer(int container_id) {
   return root_window()->GetChildById(container_id);
 }
 
 const aura::Window* RootWindowController::GetContainer(int container_id) const {
   return root_window_->window()->GetChildById(container_id);
 }
 
-void RootWindowController::ShowLauncher() {
-  if (!shelf_->launcher())
+void RootWindowController::ShowShelf() {
+  if (!shelf_->shelf())
     return;
-  shelf_->launcher()->SetVisible(true);
+  shelf_->shelf()->SetVisible(true);
   shelf_->status_area_widget()->Show();
 }
 
-void RootWindowController::OnLauncherCreated() {
+void RootWindowController::OnShelfCreated() {
   if (panel_layout_manager_)
-    panel_layout_manager_->SetLauncher(shelf_->launcher());
+    panel_layout_manager_->SetShelf(shelf_->shelf());
   if (docked_layout_manager_) {
-    docked_layout_manager_->SetLauncher(shelf_->launcher());
+    docked_layout_manager_->SetShelf(shelf_->shelf());
     if (shelf_->shelf_layout_manager())
       docked_layout_manager_->AddObserver(shelf_->shelf_layout_manager());
   }
 }
 
 void RootWindowController::UpdateAfterLoginStatusChange(
     user::LoginStatus status) {
   if (status != user::LOGGED_IN_NONE)
     mouse_event_target_.reset();
   if (shelf_->status_area_widget())
@@ skipping 271 matching lines @@
     root_window_layout()->OnWindowResized();
     if (!keyboard::IsKeyboardUsabilityExperimentEnabled())
       shell->InitKeyboard();
   } else {
     root_window_layout()->OnWindowResized();
     shell->desktop_background_controller()->OnRootWindowAdded(root_window());
     shell->high_contrast_controller()->OnRootWindowAdded(
         root_window_->window());
     root_window_->host()->Show();
 
-    // Create a launcher if a user is already logged in.
+    // Create a shelf if a user is already logged in.
     if (shell->session_state_delegate()->NumberOfLoggedInUsers())
-      shelf()->CreateLauncher();
+      shelf()->CreateShelf();
   }
 
   solo_window_tracker_.reset(new SoloWindowTracker(root_window_.get()));
   if (docked_layout_manager_)
     docked_layout_manager_->AddObserver(solo_window_tracker_.get());
 }
 
 void RootWindowController::InitLayoutManagers() {
   root_window_layout_ = new RootWindowLayoutManager(root_window());
   root_window()->SetLayoutManager(root_window_layout_);
@@ skipping 282 matching lines @@
     DisableTouchHudProjection();
 }
 
 RootWindowController* GetRootWindowController(
     const aura::Window* root_window) {
   return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
 }
 
 }  // namespace internal
 }  // namespace ash