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

Unified Diff: ui/views/widget/desktop_aura/desktop_stacking_client.cc

Issue 11377140: re-re-land of https://codereview.chromium.org/11364053/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more renames\! 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 | « ui/views/widget/desktop_aura/desktop_stacking_client.h ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_stacking_client.cc
diff --git a/ui/views/widget/desktop_aura/desktop_stacking_client.cc b/ui/views/widget/desktop_aura/desktop_stacking_client.cc
index 9c111a667992741d2508ba67fbe2596449550721..0893564229f93853882d61f97f1a5ef80875eaa1 100644
--- a/ui/views/widget/desktop_aura/desktop_stacking_client.cc
+++ b/ui/views/widget/desktop_aura/desktop_stacking_client.cc
@@ -27,7 +27,8 @@ DesktopStackingClient::~DesktopStackingClient() {
aura::client::SetStackingClient(NULL);
}
-aura::Window* DesktopStackingClient::GetDefaultParent(aura::Window* window,
+aura::Window* DesktopStackingClient::GetDefaultParent(aura::Window* context,
+ aura::Window* window,
const gfx::Rect& bounds) {
if (!null_parent_.get())
CreateNULLParent();
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_stacking_client.h ('k') | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698