Move *ShellWindowLauncher* to *AppWindowLauncher*

chrome/browser/ui/ash/launcher/multi_profile_app_window_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_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;
 
   // Overridden from AppWindowRegistry::Observer:
   virtual void OnAppWindowAdded(apps::AppWindow* app_window) OVERRIDE;
   virtual void OnAppWindowRemoved(apps::AppWindow* app_window) OVERRIDE;
 
  private:
   typedef std::vector<apps::AppWindow*> AppWindowList;
   typedef std::vector<apps::AppWindowRegistry*> AppWindowRegistryList;
 
   // A list of all app windows for all users.
   AppWindowList app_window_list_;
 
   // 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_