Chromium Code Reviews| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| index 8bbc8df797f0d402386f096c4c187d93a47ed680..828de77949713a19909971b0e73acbbbbcc8b193 100644 |
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc |
| @@ -368,10 +368,6 @@ void ChromeLauncherController::SetV1AppStatus(const std::string& app_id, |
| } |
| } |
| -void ChromeLauncherController::Launch(const ash::ShelfID& id, int event_flags) { |
| - LaunchApp(id, ash::LAUNCH_FROM_UNKNOWN, event_flags); |
| -} |
| - |
| void ChromeLauncherController::Close(const ash::ShelfID& id) { |
| ash::ShelfItemDelegate* delegate = model_->GetShelfItemDelegate(id); |
| if (!delegate) |
| @@ -394,8 +390,9 @@ bool ChromeLauncherController::IsPlatformApp(const ash::ShelfID& id) { |
| void ChromeLauncherController::LaunchApp(const ash::ShelfID& id, |
| ash::ShelfLaunchSource source, |
| - int event_flags) { |
| - launcher_controller_helper_->LaunchApp(id, source, event_flags); |
| + int event_flags, |
| + const aura::Window* root_window) { |
| + launcher_controller_helper_->LaunchApp(id, source, event_flags, root_window); |
| } |
| void ChromeLauncherController::ActivateApp(const std::string& app_id, |
| @@ -415,7 +412,7 @@ void ChromeLauncherController::ActivateApp(const std::string& app_id, |
| if (!item_delegate->GetRunningApplications().empty()) |
| SelectItemWithSource(item_delegate.get(), source); |
| else |
| - LaunchApp(shelf_id, source, event_flags); |
| + LaunchApp(shelf_id, source, event_flags, NULL); |
|
stevenjb
2017/05/22 17:55:29
nullptr /* root_window */
|
| } |
| void ChromeLauncherController::SetLauncherItemImage( |