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

Unified Diff: athena/content/app_activity_proxy.cc

Issue 480293003: Adding functions to the window_list_provider for accessing the activities window list (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Created 6 years, 3 months 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: athena/content/app_activity_proxy.cc
diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc
index a5ca0f41a6c7147d07ef6d42a7f795ef05103358..bf08a592c1cb28d141630ccd6229e95978b2e1f7 100644
--- a/athena/content/app_activity_proxy.cc
+++ b/athena/content/app_activity_proxy.cc
@@ -5,6 +5,8 @@
#include "athena/content/app_activity_proxy.h"
#include "athena/content/app_activity_registry.h"
+#include "athena/wm/public/window_list_provider.h"
+#include "athena/wm/public/window_manager.h"
#include "ui/aura/window.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -58,10 +60,10 @@ aura::Window* AppActivityProxy::GetWindow() {
void AppActivityProxy::Init() {
DCHECK(replaced_activity_);
- // TODO(skuhne): This should call the WindowListProvider to re-arrange.
- // At this point we can move the Activity to its proper Activity location.
- aura::Window* relative_window = replaced_activity_->GetWindow();
- relative_window->parent()->StackChildBelow(GetWindow(), relative_window);
+ WindowListProvider* window_list_provider =
+ WindowManager::GetInstance()->GetWindowListProvider();
+ window_list_provider->StackWindowBehindTo(GetWindow(),
+ replaced_activity_->GetWindow());
// We moved.
replaced_activity_ = NULL;
}

Powered by Google App Engine
This is Rietveld 408576698