| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
|
| index 649d38bc4edea7bc37c5ce9453cc42ec892afefe..f2387f24c7462e5a1af721e82a660bdcba1a2fa7 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.cc
|
| @@ -853,6 +853,13 @@ const Extension* ChromeLauncherControllerPerBrowser::GetExtensionForAppID(
|
| return profile_->GetExtensionService()->GetInstalledExtension(app_id);
|
| }
|
|
|
| +void ChromeLauncherControllerPerBrowser::ActivateWindowOrMinimizeIfActive(
|
| + BaseWindow* window,
|
| + bool allow_minimize) {
|
| + window->Show();
|
| + window->Activate();
|
| +}
|
| +
|
| void ChromeLauncherControllerPerBrowser::OnBrowserShortcutClicked(
|
| int event_flags) {
|
| if (event_flags & ui::EF_CONTROL_DOWN) {
|
|
|