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

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes and stuff for sky 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: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index fdfee2726c604a69002467d7e7dd476aae235d13..f75f25414ce34b2a57b026df2b506e635a00334e 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -499,7 +499,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size) {
window_->SetType(aura::client::WINDOW_TYPE_CONTROL);
window_->SetTransparent(false);
window_->Init(ui::LAYER_NOT_DRAWN);
- window_->SetParent(NULL);
+ // TODO(erg): Do something else here later.
+ window_->SetDefaultParentByRoot(NULL, gfx::Rect());
window_->layer()->SetMasksToBounds(true);
window_->SetName("WebContentsViewAura");

Powered by Google App Engine
This is Rietveld 408576698