Chromium Code Reviews| Index: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc |
| diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc |
| index d6e8f2e2499f857ff29190b78260f7cee1f8a596..ccee5f499d530f6d37de6267e72ccfb848f7203c 100644 |
| --- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc |
| +++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc |
| @@ -6,6 +6,7 @@ |
| #include <string> |
| #include "ash/common/shelf/shelf_delegate.h" |
| +#include "ash/common/shelf/shelf_model.h" |
| #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" |
| #include "ash/common/wm/window_state.h" |
| #include "ash/common/wm_window.h" |
| @@ -659,7 +660,8 @@ ArcAppWindowLauncherController::AttachControllerToTask( |
| if (!shelf_id) { |
| owner()->CreateAppLauncherItem(std::move(controller), ash::STATUS_RUNNING); |
| } else { |
| - owner()->SetShelfItemDelegate(shelf_id, std::move(controller)); |
| + ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model(); |
| + shelf_model->SetShelfItemDelegate(shelf_id, std::move(controller)); |
|
James Cook
2017/04/07 20:42:22
optional: I would be OK with keeping a CLC::SetShe
msw
2017/04/07 22:02:16
Both belong on our ShelfController ash mojo interf
|
| owner()->SetItemStatus(shelf_id, ash::STATUS_RUNNING); |
| } |
| item_controller->AddTaskId(task_id); |