Renames LauncherID, LauncherItem and LauncherItems...

chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <list>
 #include <string>
 
@@ skipping 21 matching lines @@
 // For apps with multiple windows, each item controller keeps track of all
 // windows associated with the app and their activation order.
 // Instances are owned by ash::ShelfItemDelegateManager.
 //
 // Tests are in chrome_launcher_controller_browsertest.cc
 
 class ShellWindowLauncherItemController : public LauncherItemController,
                                           public aura::WindowObserver {
  public:
   ShellWindowLauncherItemController(Type type,
-                                    const std::string& app_launcher_id,
+                                    const std::string& app_shelf_id,
                                     const std::string& app_id,
                                     ChromeLauncherController* controller);
 
   virtual ~ShellWindowLauncherItemController();
 
   void AddShellWindow(apps::ShellWindow* shell_window,
                       ash::ShelfItemStatus status);
 
   void RemoveShellWindowForWindow(aura::Window* window);
 
   void SetActiveWindow(aura::Window* window);
 
-  const std::string& app_launcher_id() const { return app_launcher_id_; }
+  const std::string& app_shelf_id() const { return app_shelf_id_; }
 
   // LauncherItemController overrides:
   virtual bool IsOpen() const OVERRIDE;
   virtual bool IsVisible() const OVERRIDE;
   virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE;
   virtual bool Activate(ash::LaunchSource source) OVERRIDE;
   virtual ChromeLauncherAppMenuItems GetApplicationList(
       int event_flags) OVERRIDE;
   virtual bool ItemSelected(const ui::Event& eent) OVERRIDE;
   virtual base::string16 GetTitle() OVERRIDE;
@@ skipping 23 matching lines @@
   // the next window of similar type.
   void ActivateOrAdvanceToNextShellWindow(apps::ShellWindow* window_to_show);
 
   // List of associated shell windows
   ShellWindowList shell_windows_;
 
   // Pointer to the most recently active shell window
   apps::ShellWindow* last_active_shell_window_;
 
   // The launcher id associated with this set of windows. There is one
-  // AppLauncherItemController for each |app_launcher_id_|.
-  const std::string app_launcher_id_;
+  // AppLauncherItemController for each |app_shelf_id_|.
+  const std::string app_shelf_id_;
 
   // Scoped list of observed windows (for removal on destruction)
   ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_