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

Unified Diff: ash/wm/default_state.cc

Issue 231733004: Merge 260031 "Fix infinite recursion on hiding panel when create..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 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
« no previous file with comments | « no previous file | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/default_state.cc
===================================================================
--- ash/wm/default_state.cc (revision 262842)
+++ ash/wm/default_state.cc (working copy)
@@ -26,7 +26,7 @@
bool IsPanel(aura::Window* window) {
return window->parent() &&
- window->parent()->id() == internal::kShellWindowId_DockedContainer;
+ window->parent()->id() == internal::kShellWindowId_PanelContainer;
}
gfx::Rect BoundsWithScreenEdgeVisible(
« no previous file with comments | « no previous file | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698