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

Unified Diff: ash/common/wm/container_finder.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/common/test/test_shelf_item_delegate.cc ('k') | ash/common/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/container_finder.cc
diff --git a/ash/common/wm/container_finder.cc b/ash/common/wm/container_finder.cc
index 60785c75c48e6905f1864cd6f62024c417d1d9e5..d29ebcee419a2131b1c0211d73a155d50f2afb54 100644
--- a/ash/common/wm/container_finder.cc
+++ b/ash/common/wm/container_finder.cc
@@ -11,6 +11,7 @@
#include "ash/common/wm_root_window_controller.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 "ui/gfx/geometry/rect.h"
@@ -91,7 +92,7 @@ WmWindow* GetDefaultParent(WmWindow* context,
return target_root->GetChildByShellWindowId(
kShellWindowId_UnparentedControlContainer);
case ui::wm::WINDOW_TYPE_PANEL:
- if (window->GetWindowState()->panel_attached())
+ if (window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED))
return target_root->GetChildByShellWindowId(
kShellWindowId_PanelContainer);
return GetContainerFromAlwaysOnTopController(target_root, window);
« no previous file with comments | « ash/common/test/test_shelf_item_delegate.cc ('k') | ash/common/wm/dock/docked_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698