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

Unified Diff: content/shell/shell_stacking_client_ash.cc

Issue 11364053: make StackingClient dispatch to either ash or desktop (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove file 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: 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 5e3fc8afa1125f4c633bcbca599841f871bbad4b..5d70697d7b5e73c647c59172219d9c37e976e52f 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()) {

Powered by Google App Engine
This is Rietveld 408576698