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

Unified Diff: content/shell/shell_stacking_client_ash.h

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 | « content/shell/shell_aura.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_stacking_client_ash.h
diff --git a/content/shell/shell_stacking_client_ash.h b/content/shell/shell_stacking_client_ash.h
index d5adbc948dda9d80a2a7fb7fece9a6d62207a805..73e420deece8753ade90aee6a177451520cf5e10 100644
--- a/content/shell/shell_stacking_client_ash.h
+++ b/content/shell/shell_stacking_client_ash.h
@@ -42,7 +42,8 @@ class ShellStackingClientAsh : public aura::client::StackingClient {
virtual ~ShellStackingClientAsh();
// 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;
private:
« no previous file with comments | « content/shell/shell_aura.cc ('k') | content/shell/shell_stacking_client_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698