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

Unified Diff: ui/views/widget/desktop_native_widget_aura.cc

Issue 11362216: reland of https://codereview.chromium.org/11364053/ w/o removing the per-rootwindow stacking client (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix dnwa 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: ui/views/widget/desktop_native_widget_aura.cc
diff --git a/ui/views/widget/desktop_native_widget_aura.cc b/ui/views/widget/desktop_native_widget_aura.cc
index df7170320104f687eb6491d50db31904136a9fa9..e57dc95372d3b73a9ae1c10d44722dc77ca97bbb 100644
--- a/ui/views/widget/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_native_widget_aura.cc
@@ -43,7 +43,8 @@ class DesktopNativeWidgetAuraStackingClient :
}
// Overridden from client::StackingClient:
- virtual aura::Window* GetDefaultParent(aura::Window* window,
+ virtual aura::Window* GetDefaultParent(aura::Window* context,
+ aura::Window* window,
const gfx::Rect& bounds) OVERRIDE {
return root_window_;
}
« no previous file with comments | « ui/views/examples/content_client/examples_browser_main_parts.cc ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698