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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.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
Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index 26a1a119ff05be013a86a225c84ce3cb72b5beba..e41350eded7b6f91638ed252dec10989279f60b5 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -238,10 +238,8 @@ ChromeNativeAppWindowViewsAuraAsh::GetRestoredState() const {
}
bool ChromeNativeAppWindowViewsAuraAsh::IsAlwaysOnTop() const {
- if (app_window()->window_type_is_panel()) {
- return
- ash::wm::GetWindowState(widget()->GetNativeWindow())->panel_attached();
- }
+ if (app_window()->window_type_is_panel())
+ return widget()->GetNativeWindow()->GetProperty(ash::kPanelAttachedKey);
return widget()->IsAlwaysOnTop();
}

Powered by Google App Engine
This is Rietveld 408576698