| 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 d7442027cef1e02902bc401258a6c8f5ab68220c..f20d0993fa9c77fda87657e9e285bac74e690031 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
|
| @@ -10,10 +10,10 @@
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| -#include "ash/common/wm_window_property.h"
|
| #include "ash/display/screen_orientation_controller_chromeos.h"
|
| #include "ash/shared/app_types.h"
|
| #include "ash/shell.h"
|
| +#include "ash/wm/window_properties.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "ash/wm/window_util.h"
|
| #include "base/bind.h"
|
| @@ -422,8 +422,7 @@ void ArcAppWindowLauncherController::AttachControllerToWindowIfNeeded(
|
| base::MakeUnique<AppWindow>(task_id, info->app_shelf_id(), widget, this));
|
| RegisterApp(info);
|
| DCHECK(info->app_window()->controller());
|
| - ash::WmWindow::Get(window)->SetIntProperty(ash::WmWindowProperty::SHELF_ID,
|
| - info->app_window()->shelf_id());
|
| + window->SetProperty(ash::kShelfIDKey, info->app_window()->shelf_id());
|
| if (ash::WmShell::Get()
|
| ->maximize_mode_controller()
|
| ->IsMaximizeModeWindowManagerEnabled()) {
|
|
|