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

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2558963002: Move shelf item tooltip flag from delegate to item. (Closed)
Patch Set: Cleanup Created 4 years 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: ash/aura/wm_window_aura.cc
diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
index 230077c79011f7ffe7797efb92a5645f60608b28..15a9faa7ff34019a13456af1264a54f0b15fad3e 100644
--- a/ash/aura/wm_window_aura.cc
+++ b/ash/aura/wm_window_aura.cc
@@ -290,6 +290,9 @@ bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
case WmWindowProperty::DRAW_ATTENTION:
return window_->GetProperty(aura::client::kDrawAttentionKey);
+ case WmWindowProperty::PANEL_ATTACHED:
+ return window_->GetProperty(kPanelAttachedKey);
+
case WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY:
return window_->GetProperty(kSnapChildrenToPixelBoundary);
@@ -307,6 +310,29 @@ bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
return false;
}
+void WmWindowAura::SetBoolProperty(WmWindowProperty key, bool value) {
sky 2016/12/08 00:38:54 Do we really need to set all these properties? I b
msw 2016/12/08 20:31:36 Reduced to just panel_attached; I was just matchin
+ switch (key) {
+ case WmWindowProperty::DRAW_ATTENTION:
+ window_->SetProperty(aura::client::kDrawAttentionKey, value);
sky 2016/12/08 00:38:54 I am tempted to say you should just route through
msw 2016/12/08 20:31:36 We need lots of ash/common cleanup... I'd opt to l
+ break;
+ case WmWindowProperty::PANEL_ATTACHED:
+ window_->SetProperty(kPanelAttachedKey, value);
+ break;
+ case WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY:
+ window_->SetProperty(kSnapChildrenToPixelBoundary, value);
+ break;
+ case WmWindowProperty::ALWAYS_ON_TOP:
+ window_->SetProperty(aura::client::kAlwaysOnTopKey, value);
+ break;
+ case WmWindowProperty::EXCLUDE_FROM_MRU:
+ window_->SetProperty(aura::client::kExcludeFromMruKey, value);
+ break;
+ default:
+ NOTREACHED();
+ break;
+ }
+}
+
SkColor WmWindowAura::GetColorProperty(WmWindowProperty key) {
if (key == WmWindowProperty::TOP_VIEW_COLOR)
return window_->GetProperty(aura::client::kTopViewColor);
@@ -888,6 +914,8 @@ void WmWindowAura::OnWindowPropertyChanged(aura::Window* window,
wm_property = WmWindowProperty::EXCLUDE_FROM_MRU;
} else if (key == aura::client::kModalKey) {
wm_property = WmWindowProperty::MODAL_TYPE;
+ } else if (key == kPanelAttachedKey) {
+ wm_property = WmWindowProperty::PANEL_ATTACHED;
} else if (key == kShelfIDKey) {
wm_property = WmWindowProperty::SHELF_ID;
} else if (key == kShelfItemTypeKey) {

Powered by Google App Engine
This is Rietveld 408576698