Move *ShellWindowLauncher* to *AppWindowLauncher*

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

 // Copyright 2013 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_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 25 matching lines @@
 #include "ui/aura/window_observer.h"
 
 class AppSyncUIState;
 class Browser;
 class BrowserShortcutLauncherItemController;
 class BrowserStatusMonitor;
 class ExtensionEnableFlow;
 class GURL;
 class LauncherItemController;
 class Profile;
-class ShellWindowLauncherController;
+class AppWindowLauncherController;
 class TabContents;
 
 namespace ash {
 class ShelfItemDelegateManager;
 class ShelfModel;
 }
 
 namespace aura {
 class Window;
 }
@@ skipping 23 matching lines @@
  private:
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerUserSwitchObserver);
 };
 
 // ChromeLauncherController manages the launcher items needed for content
 // windows. Launcher items have a type, an optional app id, and a controller.
 // This incarnation groups running tabs/windows in application specific lists.
 // * Browser app windows have BrowserLauncherItemController, owned by the
 //   BrowserView instance.
-// * App shell windows have ShellWindowLauncherItemController, owned by
-//   ShellWindowLauncherController.
+// * App shell windows have AppWindowLauncherItemController, owned by
+//   AppWindowLauncherController.
 // * Shortcuts have no LauncherItemController.
 class ChromeLauncherController : public ash::ShelfDelegate,
                                  public ash::ShelfModelObserver,
                                  public ash::ShellObserver,
                                  public ash::DisplayController::Observer,
                                  public content::NotificationObserver,
                                  public extensions::AppIconLoader::Delegate,
                                  public PrefServiceSyncableObserver,
                                  public AppSyncUIStateObserver,
                                  public ExtensionEnableFlowDelegate,
@@ skipping 279 matching lines @@
 
   // Returns true if |browser| is owned by the active user.
   bool IsBrowserFromActiveUser(Browser* browser);
 
   // Access to the BrowserStatusMonitor for tests.
   BrowserStatusMonitor* browser_status_monitor_for_test() {
     return browser_status_monitor_.get();
   }
 
   // Access to the ShellWindowController for tests.
-  ShellWindowLauncherController* shell_window_controller_for_test() {
+  AppWindowLauncherController* shell_window_controller_for_test() {
     return shell_window_controller_.get();
   }
 
  protected:
   // Creates a new app shortcut item and controller on the shelf at |index|.
   // Use kInsertItemAtEnd to add a shortcut as the last item.
   ash::ShelfID CreateAppShortcutLauncherItem(const std::string& app_id,
                                              int index);
 
   // Sets the AppTabHelper/AppIconLoader, taking ownership of the helper class.
@@ skipping 146 matching lines @@
   Profile* profile_;
 
   IDToItemControllerMap id_to_item_controller_map_;
 
   // Maintains activation order of web contents for each app.
   AppIDToWebContentsListMap app_id_to_web_contents_list_;
 
   // Direct access to app_id for a web contents.
   WebContentsToAppIDMap web_contents_to_app_id_;
 
   // Used to track shell windows.

[Mr4D (OOO till 08-26), 2014/02/18 23:37:03]

"Used to track app windows."?

-  scoped_ptr<ShellWindowLauncherController> shell_window_controller_;
+  scoped_ptr<AppWindowLauncherController> shell_window_controller_;

[Mr4D (OOO till 08-26), 2014/02/18 23:37:03]

Shouldn't this also be renamed to |app_window_controller_|?

[Ken Rockot(use gerrit already), 2014/02/18 23:51:54]

Good catch on these. Thanks.

Fixed and also caught a few other comments and test changes.

 
   // Used to get app info for tabs.
   scoped_ptr<AppTabHelper> app_tab_helper_;
 
   // Used to load the image for an app item.
   scoped_ptr<extensions::AppIconLoader> app_icon_loader_;
 
   content::NotificationRegistrar notification_registrar_;
 
   PrefChangeRegistrar pref_change_registrar_;
@@ skipping 20 matching lines @@
   // The list of running & un-pinned applications for different users on hidden
   // desktops.
   typedef std::vector<std::string> RunningAppListIds;
   typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap;
   RunningAppListIdMap last_used_running_application_order_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_