Rename Launcher to Shelf.

ash/shelf/overflow_button.cc

Index: ash/shelf/overflow_button.cc
diff --git a/ash/shelf/overflow_button.cc b/ash/shelf/overflow_button.cc
index 66d5476a8dcb96bf0daa672c104541bb46a85768..3c899efd81a0aa4f8e6df45e2c89bc581c3b7506 100644
--- a/ash/shelf/overflow_button.cc
+++ b/ash/shelf/overflow_button.cc
@@ -57,7 +57,7 @@ void OverflowButton::PaintBackground(gfx::Canvas* canvas, int alpha) {
   gfx::Rect bounds(GetContentsBounds());
   gfx::Rect rect(0, 0, kButtonHoverSize, kButtonHoverSize);
   ShelfLayoutManager* shelf =
-      ShelfLayoutManager::ForLauncher(GetWidget()->GetNativeView());
+      ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
 
   // Nudge the background a little to line up right.
   if (shelf->IsHorizontalAlignment()) {
@@ -85,15 +85,15 @@ void OverflowButton::PaintBackground(gfx::Canvas* canvas, int alpha) {
 }
 
 void OverflowButton::OnPaint(gfx::Canvas* canvas) {
-  ShelfLayoutManager* layout_manager = ShelfLayoutManager::ForLauncher(
-      GetWidget()->GetNativeView());
+  ShelfLayoutManager* layout_manager =
+      ShelfLayoutManager::ForShelf(GetWidget()->GetNativeView());
   ShelfAlignment alignment = layout_manager->GetAlignment();
 
   gfx::Rect bounds(GetContentsBounds());
   if (ash::switches::UseAlternateShelfLayout()) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     int background_image_id = 0;
-    if (layout_manager->shelf_widget()->launcher()->IsShowingOverflowBubble())
+    if (layout_manager->shelf_widget()->shelf()->IsShowingOverflowBubble())
       background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
     else if(layout_manager->shelf_widget()->GetDimsShelf())
       background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;