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

Unified Diff: content/shell/shell_stacking_client_ash.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 | « content/shell/shell_stacking_client_ash.h ('k') | ui/aura/client/stacking_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_stacking_client_ash.cc
diff --git a/content/shell/shell_stacking_client_ash.cc b/content/shell/shell_stacking_client_ash.cc
index cdc93a72117bc73a13c52ca5757eea6901314cfd..75a708b95bbf41dbcc3b789dd4ca2c899e39293a 100644
--- a/content/shell/shell_stacking_client_ash.cc
+++ b/content/shell/shell_stacking_client_ash.cc
@@ -14,7 +14,6 @@
namespace content {
ShellStackingClientAsh::ShellStackingClientAsh() {
- aura::client::SetStackingClient(this);
}
ShellStackingClientAsh::~ShellStackingClientAsh() {
@@ -25,6 +24,7 @@ ShellStackingClientAsh::~ShellStackingClientAsh() {
}
aura::Window* ShellStackingClientAsh::GetDefaultParent(
+ aura::Window* context,
aura::Window* window,
const gfx::Rect& bounds) {
if (!root_window_.get()) {
« no previous file with comments | « content/shell/shell_stacking_client_ash.h ('k') | ui/aura/client/stacking_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698