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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase + disable prerender tests on win-aura 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
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 9ffe30b8b3b2d6cf325b803dc3297246ae167aa3..a9dcef2ddb5be545887b26b9649ba39847105890 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -325,7 +325,8 @@ void RenderWidgetHostViewAura::InitAsPopup(
gfx::Point origin_in_screen(bounds_in_display.origin());
screen_position_client->ConvertPointToScreen(root, &origin_in_screen);
parent = aura::client::GetStackingClient()->GetDefaultParent(
- window_, gfx::Rect(origin_in_screen, bounds_in_display.size()));
+ window_, window_,
+ gfx::Rect(origin_in_screen, bounds_in_display.size()));
}
window_->SetParent(parent);
SetBounds(bounds_in_display);
@@ -352,7 +353,8 @@ void RenderWidgetHostViewAura::InitAsFullscreen(
aura::client::StackingClient* stacking_client =
aura::client::GetStackingClient();
if (stacking_client)
- parent = stacking_client->GetDefaultParent(window_, display.bounds());
+ parent = stacking_client->GetDefaultParent(
+ window_, window_, display.bounds());
}
window_->SetParent(parent);
Show();
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | content/shell/shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698