Rename Launcher to Shelf.

ash/system/status_area_widget.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/system/status_area_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
@@ skipping 58 matching lines @@
   // hierarchy. Do not used scoped pointers since we don't want to destroy them
   // in the destructor if Shutdown() is not called (e.g. in tests).
   delete logout_button_tray_;
   logout_button_tray_ = NULL;
   delete web_notification_tray_;
   web_notification_tray_ = NULL;
   delete system_tray_;
   system_tray_ = NULL;
 }
 
-bool StatusAreaWidget::ShouldShowLauncher() const {
-  if ((system_tray_ && system_tray_->ShouldShowLauncher()) ||
+bool StatusAreaWidget::ShouldShowShelf() const {
+  if ((system_tray_ && system_tray_->ShouldShowShelf()) ||
       (web_notification_tray_ &&
-       web_notification_tray_->ShouldBlockLauncherAutoHide()))
+       web_notification_tray_->ShouldBlockShelfAutoHide()))
     return true;
 
-  if (!RootWindowController::ForLauncher(GetNativeView())->shelf()->IsVisible())
+  if (!RootWindowController::ForShelf(GetNativeView())->shelf()->IsVisible())
     return false;
 
-  // If the launcher is currently visible, don't hide the launcher if the mouse
+  // If the shelf is currently visible, don't hide the shelf if the mouse
   // is in any of the notification bubbles.
   return (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
         (web_notification_tray_ &&
          web_notification_tray_->IsMouseInNotificationBubble());
 }
 
 bool StatusAreaWidget::IsMessageBubbleShown() const {
   return ((system_tray_ && system_tray_->IsAnyBubbleVisible()) ||
           (web_notification_tray_ &&
            web_notification_tray_->IsMessageCenterBubbleVisible()));
@@ skipping 44 matching lines @@
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
   if (logout_button_tray_)
     logout_button_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace internal
 }  // namespace ash