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

Unified Diff: ash/aura/wm_window_aura.cc

Issue 2558963002: Move shelf item tooltip flag from delegate to item. (Closed)
Patch Set: Remove WmWindowMus::SetBoolProperty override. 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
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/shelf/app_list_shelf_item_delegate.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 230077c79011f7ffe7797efb92a5645f60608b28..17d36875349be633a6dd4164c1e64b9933816c70 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,17 @@ bool WmWindowAura::GetBoolProperty(WmWindowProperty key) {
return false;
}
+void WmWindowAura::SetBoolProperty(WmWindowProperty key, bool value) {
+ switch (key) {
+ case WmWindowProperty::PANEL_ATTACHED:
+ window_->SetProperty(kPanelAttachedKey, value);
+ break;
+ default:
+ NOTREACHED();
+ break;
+ }
+}
+
SkColor WmWindowAura::GetColorProperty(WmWindowProperty key) {
if (key == WmWindowProperty::TOP_VIEW_COLOR)
return window_->GetProperty(aura::client::kTopViewColor);
@@ -888,6 +902,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) {
« no previous file with comments | « ash/aura/wm_window_aura.h ('k') | ash/common/shelf/app_list_shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698