| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h
|
| index a88b98f153e21fcc6dae67eab308d243c209d56f..a133f4b3a95a8adec3d70c69c5c6d77db6ae5361 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h
|
| @@ -30,6 +30,7 @@
|
| #include "ui/aura/window_observer.h"
|
|
|
| class AppSyncUIState;
|
| +class BaseWindow;
|
| class Browser;
|
| class BrowserLauncherItemControllerTest;
|
| class ExtensionEnableFlow;
|
| @@ -241,6 +242,11 @@ class ChromeLauncherControllerPerBrowser
|
| virtual const extensions::Extension* GetExtensionForAppID(
|
| const std::string& app_id) const OVERRIDE;
|
|
|
| + // Activates a |window|. If |allow_minimize| is true and the system allows
|
| + // it, the the window will get minimized instead.
|
| + virtual void ActivateWindowOrMinimizeIfActive(BaseWindow* window,
|
| + bool allow_minimize) OVERRIDE;
|
| +
|
| // ash::LauncherDelegate overrides:
|
| virtual void OnBrowserShortcutClicked(int event_flags) OVERRIDE;
|
| virtual void ItemClicked(const ash::LauncherItem& item,
|
|
|