Move *ShellWindowLauncher* to *AppWindowLauncher*

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

Index: chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_shell_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
similarity index 52%
rename from chrome/browser/ui/ash/launcher/multi_profile_shell_window_launcher_controller.h
rename to chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
index dd6bd2820c489bf271aff53dd81c9374ebb30fb1..ce1f1606dd71d9cd7fd9e9c57daa2e64a146e9bd 100644
--- a/chrome/browser/ui/ash/launcher/multi_profile_shell_window_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
@@ -2,23 +2,21 @@
 // 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_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CONTROLLER_H_
-#define CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
+#define CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_APP_WINDOW_LAUNCHER_CONTROLLER_H_
 
-#include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h"
+#include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
 
-// Inherits from ShellWindowLauncherController and overwrites the ShellWindow
+// Inherits from AppWindowLauncherController and overwrites the AppWindow
 // observing functions to switch between users dynamically.
-// TODO(jamescook): Rename this to MultiProfileAppWindowLauncherController.
-// http://crbug.com/344079
-class MultiProfileShellWindowLauncherController
-    : public ShellWindowLauncherController {
+class MultiProfileAppWindowLauncherController
+    : public AppWindowLauncherController {
  public:
-  explicit MultiProfileShellWindowLauncherController(
+  explicit MultiProfileAppWindowLauncherController(
       ChromeLauncherController* owner);
-  virtual ~MultiProfileShellWindowLauncherController();
+  virtual ~MultiProfileAppWindowLauncherController();
 
-  // Overridden from ShellWindowLauncherController:
+  // Overridden from AppWindowLauncherController:
   virtual void ActiveUserChanged(const std::string& user_email) OVERRIDE;
   virtual void AdditionalUserAddedToSession(Profile* profile) OVERRIDE;
 
@@ -36,7 +34,7 @@ class MultiProfileShellWindowLauncherController
   // A list of the app window registries which we additionally observe.
   AppWindowRegistryList multi_user_registry_;
 
-  DISALLOW_COPY_AND_ASSIGN(MultiProfileShellWindowLauncherController);
+  DISALLOW_COPY_AND_ASSIGN(MultiProfileAppWindowLauncherController);
 };
 
-#endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_SHELL_WINDOW_LAUNCHER_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_MULTI_PROFILE_APP_WINDOW_LAUNCHER_CONTROLLER_H_