Renames LauncherID, LauncherItem and LauncherItems...

chrome/browser/ui/ash/launcher/launcher_context_menu.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 "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 
 #include <string>
 
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/metrics/user_metrics_recorder.h"
@@ skipping 19 matching lines @@
 
 namespace {
 
 bool MenuItemHasLauncherContext(const extensions::MenuItem* item) {
   return item->contexts().Contains(extensions::MenuItem::LAUNCHER);
 }
 
 }  // namespace
 
 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
-                                         const ash::LauncherItem* item,
+                                         const ash::ShelfItem* item,
                                          aura::Window* root)
     : ui::SimpleMenuModel(NULL),
       controller_(controller),
       item_(*item),
       shelf_alignment_menu_(root),
       root_window_(root),
       item_delegate_(NULL) {
   DCHECK(item);
   DCHECK(root_window_);
   Init();
 }
 
-LauncherContextMenu::LauncherContextMenu(
-    ChromeLauncherController* controller,
-    ash::ShelfItemDelegate* item_delegate,
-    ash::LauncherItem* item,
-    aura::Window* root)
+LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
+                                         ash::ShelfItemDelegate* item_delegate,
+                                         ash::ShelfItem* item,
+                                         aura::Window* root)
     : ui::SimpleMenuModel(NULL),
       controller_(controller),
       item_(*item),
       shelf_alignment_menu_(root),
       root_window_(root),
       item_delegate_(item_delegate) {
   DCHECK(item);
   DCHECK(root_window_);
   Init();
 }
 
 LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
                                          aura::Window* root)
     : ui::SimpleMenuModel(NULL),
       controller_(controller),
-      item_(ash::LauncherItem()),
+      item_(ash::ShelfItem()),
       shelf_alignment_menu_(root),
       extension_items_(new extensions::ContextMenuMatcher(
           controller->profile(), this, this,
           base::Bind(MenuItemHasLauncherContext))),
       root_window_(root),
       item_delegate_(NULL) {
   DCHECK(root_window_);
   Init();
 }
 
@@ skipping 66 matching lines @@
       }
       if (controller_->IsOpen(item_.id)) {
         AddItem(MENU_CLOSE,
                 l10n_util::GetStringUTF16(IDS_LAUNCHER_CONTEXT_MENU_CLOSE));
       }
     }
     AddSeparator(ui::NORMAL_SEPARATOR);
     if (item_.type == ash::TYPE_APP_SHORTCUT ||
         item_.type == ash::TYPE_WINDOWED_APP ||
         item_.type == ash::TYPE_PLATFORM_APP) {
-      std::string app_id = controller_->GetAppIDForLauncherID(item_.id);
+      std::string app_id = controller_->GetAppIDForShelfID(item_.id);
       if (!app_id.empty()) {
         int index = 0;
         extension_items_->AppendExtensionItems(
             app_id, base::string16(), &index);
         AddSeparator(ui::NORMAL_SEPARATOR);
       }
     }
   }
   // In fullscreen, the launcher is either hidden or autohidden depending on
   // the type of fullscreen. Do not show the auto-hide menu item while in
@@ skipping 153 matching lines @@
     case MENU_CHANGE_WALLPAPER:
       ash::Shell::GetInstance()->user_wallpaper_delegate()->
           OpenSetWallpaperPage();
       break;
 #endif
     default:
       extension_items_->ExecuteCommand(command_id, NULL,
                                        content::ContextMenuParams());
   }
 }