Move *ShellWindowLauncher* to *AppWindowLauncher*

chrome/browser/ui/ash/launcher/app_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_
+#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
+#define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <list>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "ui/aura/window_observer.h"
 
 namespace apps {
 class AppWindow;
 }
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
 class Image;
 }
 
 class ChromeLauncherController;
 
-// This is a ShellWindowItemLauncherController for app windows. There is one
-// instance per app, per launcher id.
-// 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.
+// This is a LauncherItemController for app windows. There is one instance per
+// app, per launcher id. 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
-//
-// TODO(jamescook): Rename to AppWindowLauncherItemController.
-// http://crbug.com/344079
-class ShellWindowLauncherItemController : public LauncherItemController,
-                                          public aura::WindowObserver {
+class AppWindowLauncherItemController : public LauncherItemController,
+                                        public aura::WindowObserver {
  public:
-  ShellWindowLauncherItemController(Type type,
-                                    const std::string& app_shelf_id,
-                                    const std::string& app_id,
-                                    ChromeLauncherController* controller);
+  AppWindowLauncherItemController(Type type,
+                                  const std::string& app_shelf_id,
+                                  const std::string& app_id,
+                                  ChromeLauncherController* controller);
 
-  virtual ~ShellWindowLauncherItemController();
+  virtual ~AppWindowLauncherItemController();
 
   void AddAppWindow(apps::AppWindow* app_window, ash::ShelfItemStatus status);
 
-  void RemoveShellWindowForWindow(aura::Window* window);
+  void RemoveAppWindowForWindow(aura::Window* window);
 
   void SetActiveWindow(aura::Window* window);
 
   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 ChromeLauncherAppMenuItems GetApplicationList(int event_flags)
+      OVERRIDE;
   virtual bool ItemSelected(const ui::Event& eent) OVERRIDE;
   virtual base::string16 GetTitle() OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;
   virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
   virtual bool IsDraggable() OVERRIDE;
   virtual bool ShouldShowTooltip() OVERRIDE;
   virtual void Close() OVERRIDE;
 
   // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) OVERRIDE;
 
   // Get the number of running applications/incarnations of this.
   size_t app_window_count() const { return app_windows_.size(); }
 
   // Activates the window at position |index|.
   void ActivateIndexedApp(size_t index);
 
  private:
   typedef std::list<apps::AppWindow*> AppWindowList;
 
   void ShowAndActivateOrMinimize(apps::AppWindow* app_window);
 
   // Activate the given |window_to_show|, or - if already selected - advance to
   // the next window of similar type.
-  void ActivateOrAdvanceToNextShellWindow(apps::AppWindow* window_to_show);
+  void ActivateOrAdvanceToNextAppWindow(apps::AppWindow* window_to_show);
 
   // List of associated app windows
   AppWindowList app_windows_;
 
   // Pointer to the most recently active app window
   apps::AppWindow* last_active_app_window_;
 
   // The launcher id associated with this set of windows. There is one
   // 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);
+  DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
 };
 
-#endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_