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

Unified Diff: ash/wm/workspace/workspace.cc

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ash_unittests Created 8 years, 1 month 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: ash/wm/workspace/workspace.cc
diff --git a/ash/wm/workspace/workspace.cc b/ash/wm/workspace/workspace.cc
index a2c03254b97e8606c15f5c9807a6ffd5e09057d9..48f994f0f9a591629b46c5d61a2afdc0e7eb6436 100644
--- a/ash/wm/workspace/workspace.cc
+++ b/ash/wm/workspace/workspace.cc
@@ -34,7 +34,7 @@ Workspace::Workspace(WorkspaceManager* manager,
// Do this so when animating out windows don't extend beyond the bounds.
window_->layer()->SetMasksToBounds(true);
window_->Hide();
- window_->SetParent(parent);
+ parent->AddChild(window_);
window_->SetProperty(internal::kUsesScreenCoordinatesKey, true);
// The layout-manager cannot be created in the initializer list since it
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller_unittest.cc ('k') | ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698