| Index: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
|
| index 9c279f6a17035b6380d1e0b1a9a65a927cc6fdf7..c47c3570b3e120fb4a261c5d2779659ef41b034e 100644
|
| --- a/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
|
| @@ -13,6 +13,10 @@
|
| #include "ui/aura/client/activation_change_observer.h"
|
| #include "ui/aura/window_observer.h"
|
|
|
| +namespace apps {
|
| +class ShellWindow;
|
| +}
|
| +
|
| namespace aura {
|
|
|
| class Window;
|
| @@ -24,7 +28,6 @@ class ActivationClient;
|
| }
|
|
|
| class ChromeLauncherController;
|
| -class ShellWindow;
|
| class ShellWindowLauncherItemController;
|
|
|
| // ShellWindowLauncherController observes the Shell Window registry and the
|
| @@ -39,9 +42,10 @@ class ShellWindowLauncherController
|
| virtual ~ShellWindowLauncherController();
|
|
|
| // Overridden from ShellWindowRegistry::Observer:
|
| - virtual void OnShellWindowAdded(ShellWindow* shell_window) OVERRIDE;
|
| - virtual void OnShellWindowIconChanged(ShellWindow* shell_window) OVERRIDE;
|
| - virtual void OnShellWindowRemoved(ShellWindow* shell_window) OVERRIDE;
|
| + virtual void OnShellWindowAdded(apps::ShellWindow* shell_window) OVERRIDE;
|
| + virtual void OnShellWindowIconChanged(
|
| + apps::ShellWindow* shell_window) OVERRIDE;
|
| + virtual void OnShellWindowRemoved(apps::ShellWindow* shell_window) OVERRIDE;
|
|
|
| // Overriden from aura::WindowObserver:
|
| virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
|
|
|