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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 2814243002: Removes a couple more functions from WmWindow (Closed)
Patch Set: cleanup Created 3 years, 8 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
« ash/root_window_controller.cc ('K') | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.cc
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
index 22bc7b2bb7e15eba52a943dae2206929adcb5622..ad89d6d76bdb5861870925b477321c245009e0ae 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/shelf/shelf_layout_manager.cc
@@ -77,9 +77,8 @@ ui::Layer* GetLayer(views::Widget* widget) {
// Returns true if the window is in the app list window container.
bool IsAppListWindow(WmWindow* window) {
- return window->GetParent() &&
- window->GetParent()->GetShellWindowId() ==
- kShellWindowId_AppListContainer;
+ return window->GetParent() && window->GetParent()->aura_window()->id() ==
+ kShellWindowId_AppListContainer;
}
} // namespace
« ash/root_window_controller.cc ('K') | « ash/root_window_controller.cc ('k') | ash/shelf/shelf_widget.cc » ('j') | chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698