Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2949)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc

Issue 2731663002: Remove WmWindowProperty (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()) {
« no previous file with comments | « ash/wm/window_mirror_view.cc ('k') | chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698