| Index: chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
|
| index 546cdbe5bf993aa214e820db367adf8d7ad170fb..520dd6432cc15e2b0b4bab704fcd53130252f8b7 100644
|
| --- a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
|
| @@ -21,18 +21,18 @@ class MultiProfileAppWindowLauncherController
|
| 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;
|
| - virtual void OnAppWindowShown(apps::AppWindow* app_window) OVERRIDE;
|
| - virtual void OnAppWindowHidden(apps::AppWindow* app_window) OVERRIDE;
|
| + virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE;
|
| + virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
|
| + virtual void OnAppWindowShown(extensions::AppWindow* app_window) OVERRIDE;
|
| + virtual void OnAppWindowHidden(extensions::AppWindow* app_window) OVERRIDE;
|
|
|
| private:
|
| - typedef std::vector<apps::AppWindow*> AppWindowList;
|
| - typedef std::vector<apps::AppWindowRegistry*> AppWindowRegistryList;
|
| + typedef std::vector<extensions::AppWindow*> AppWindowList;
|
| + typedef std::vector<extensions::AppWindowRegistry*> AppWindowRegistryList;
|
|
|
| // Returns true if the owner of the given |app_window| has a window teleported
|
| // of the |app_window|'s application type to the current desktop.
|
| - bool UserHasAppOnActiveDesktop(apps::AppWindow* app_window);
|
| + bool UserHasAppOnActiveDesktop(extensions::AppWindow* app_window);
|
|
|
| // A list of all app windows for all users.
|
| AppWindowList app_window_list_;
|
|
|