Move *ShellWindowLauncher* to *AppWindowLauncher*

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index b8c5261bd772bbd614d1b62021dad37f37b33eea..9d5b86deb96eb39fda4e6a917a2f0960c1d7e610 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -43,7 +43,7 @@ class ExtensionEnableFlow;
 class GURL;
 class LauncherItemController;
 class Profile;
-class ShellWindowLauncherController;
+class AppWindowLauncherController;
 class TabContents;
 
 namespace ash {
@@ -87,8 +87,8 @@ class ChromeLauncherControllerUserSwitchObserver {
 // 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,
@@ -388,7 +388,7 @@ class ChromeLauncherController : public ash::ShelfDelegate,
   }
 
   // Access to the ShellWindowController for tests.
-  ShellWindowLauncherController* shell_window_controller_for_test() {
+  AppWindowLauncherController* shell_window_controller_for_test() {
     return shell_window_controller_.get();
   }
 
@@ -556,7 +556,7 @@ class ChromeLauncherController : public ash::ShelfDelegate,
   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_;