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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/wm/system_modal_container_layout_manager.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
« no previous file with comments | « ash/common/wm/panels/panel_window_resizer.cc ('k') | ash/common/wm/wm_snap_to_pixel_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/system_modal_container_layout_manager.cc
diff --git a/ash/common/wm/system_modal_container_layout_manager.cc b/ash/common/wm/system_modal_container_layout_manager.cc
index ad52259e05fe72e2d74a9e44582fb4ed53f2750a..d6d8d0406f86c8f245847544660f07ff9212869e 100644
--- a/ash/common/wm/system_modal_container_layout_manager.cc
+++ b/ash/common/wm/system_modal_container_layout_manager.cc
@@ -10,7 +10,6 @@
#include "ash/common/wm/window_dimmer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/common/wm_window_property.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
@@ -27,7 +26,7 @@ const int kCenterPixelDelta = 32;
ui::ModalType GetModalType(WmWindow* window) {
return static_cast<ui::ModalType>(
- window->GetIntProperty(WmWindowProperty::MODAL_TYPE));
+ window->aura_window()->GetProperty(aura::client::kModalKey));
}
bool HasTransientAncestor(const WmWindow* window, const WmWindow* ancestor) {
« no previous file with comments | « ash/common/wm/panels/panel_window_resizer.cc ('k') | ash/common/wm/wm_snap_to_pixel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698