| Index: chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| index 8a8ba69663a8f398de304d7d0c830641330687ca..9fd428d34174664768ee94dae1db41c3f1fc1a3b 100644
|
| --- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
|
| @@ -51,16 +51,16 @@ class AppWindowLauncherController
|
|
|
| // Overridden from AppWindowRegistry::Observer:
|
| virtual void OnAppWindowIconChanged(
|
| - extensions::AppWindow* app_window) OVERRIDE;
|
| - virtual void OnAppWindowShown(extensions::AppWindow* app_window) OVERRIDE;
|
| - virtual void OnAppWindowHidden(extensions::AppWindow* app_window) OVERRIDE;
|
| + extensions::AppWindow* app_window) override;
|
| + virtual void OnAppWindowShown(extensions::AppWindow* app_window) override;
|
| + virtual void OnAppWindowHidden(extensions::AppWindow* app_window) override;
|
|
|
| // Overriden from aura::WindowObserver:
|
| - virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
|
| + virtual void OnWindowDestroying(aura::Window* window) override;
|
|
|
| // Overriden from client::ActivationChangeObserver:
|
| virtual void OnWindowActivated(aura::Window* gained_active,
|
| - aura::Window* lost_active) OVERRIDE;
|
| + aura::Window* lost_active) override;
|
|
|
| protected:
|
| // Registers a app window with the shelf and this object.
|
|
|