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

Unified Diff: ui/aura_shell/examples/lock_view.cc

Issue 8399044: aura: Make sure the desktop widget gets parented to the correct container. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 2 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 | « ui/aura_shell/desktop_background_view.cc ('k') | ui/aura_shell/workspace/workspace_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/examples/lock_view.cc
diff --git a/ui/aura_shell/examples/lock_view.cc b/ui/aura_shell/examples/lock_view.cc
index a8f0b3f0f5a17216f4b366dba89fcf86de01acda..cb0eae4e1bba6cd0c4348f5402ca4658dc917ec9 100644
--- a/ui/aura_shell/examples/lock_view.cc
+++ b/ui/aura_shell/examples/lock_view.cc
@@ -60,9 +60,10 @@ void CreateLock() {
(desktop_size.height() - ps.height()) / 2,
ps.width(), ps.height());
params.delegate = lock_view;
- params.parent = Shell::GetInstance()->GetContainer(
- aura_shell::internal::kShellWindowId_LockScreenContainer);
widget->Init(params);
+ Shell::GetInstance()->GetContainer(
+ aura_shell::internal::kShellWindowId_LockScreenContainer)->
+ AddChild(widget->GetNativeView());
widget->SetContentsView(lock_view);
widget->Show();
widget->GetNativeView()->set_name("LockView");
« no previous file with comments | « ui/aura_shell/desktop_background_view.cc ('k') | ui/aura_shell/workspace/workspace_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698