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

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2192553002: mash: Convert ShelfWindowWatcher to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits and better test Created 4 years, 5 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/aura/wm_window_aura.h ('k') | ash/common/wm_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_window_aura.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
index 82a18dd4ab68793f972c2539c234b87964839341..23a1556ac094bf00ee9298df981e2303bd5e49c4 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/aura/wm_window_aura.cc
@@ -278,6 +278,19 @@ int WmWindowAura::GetIntProperty(WmWindowProperty key) {
return 0;
}
+void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) {
+ if (key == WmWindowProperty::SHELF_ID) {
+ SetShelfIDForWindow(value, window_);
+ return;
+ }
+
+ NOTREACHED();
+}
+
+ShelfItemDetails* WmWindowAura::GetShelfItemDetails() {
+ return window_->GetProperty(kShelfItemDetailsKey);
+}
+
const wm::WindowState* WmWindowAura::GetWindowState() const {
return ash::wm::GetWindowState(window_);
}
@@ -710,6 +723,8 @@ void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
wm_property = WmWindowProperty::ALWAYS_ON_TOP;
} else if (key == kShelfID) {
wm_property = WmWindowProperty::SHELF_ID;
+ } else if (key == kShelfItemDetailsKey) {
+ wm_property = WmWindowProperty::SHELF_ITEM_DETAILS;
} else if (key == aura::client::kTopViewInset) {
wm_property = WmWindowProperty::TOP_VIEW_INSET;
} else if (key == aura::client::kExcludeFromMruKey) {
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/wm_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698