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

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: 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: 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 4ddac185ec829f972048e2c8a6164158de4915dd..a773453a5046b78b976d93f103e4db06646f1d4e 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -504,7 +504,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_->SetDefaultParentByRootWindow(NULL, gfx::Rect());
window_->layer()->SetMasksToBounds(true);
window_->SetName("WebContentsViewAura");
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | ui/aura/client/stacking_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698