Index: athena/content/app_activity_proxy.cc |
diff --git a/athena/content/app_activity_proxy.cc b/athena/content/app_activity_proxy.cc |
index 143dd88af2c001f30f262606970a767512d2f47c..82602205e612b982cc188ce47f5d27e085053689 100644 |
--- a/athena/content/app_activity_proxy.cc |
+++ b/athena/content/app_activity_proxy.cc |
@@ -11,7 +11,6 @@ |
#include "ui/aura/window.h" |
#include "ui/views/view.h" |
#include "ui/views/widget/widget.h" |
-#include "ui/wm/core/window_util.h" |
namespace athena { |
@@ -69,10 +68,6 @@ void AppActivityProxy::Init() { |
WindowManager::Get()->GetWindowListProvider(); |
window_list_provider->StackWindowBehindTo(GetWindow(), |
replaced_activity_->GetWindow()); |
- // Creating this object was moving the activation to this window which should |
- // not be the active window. As such we re-activate the top activity window. |
- // TODO(skuhne): This should possibly move to the WindowListProvider. |
- wm::ActivateWindow(window_list_provider->GetWindowList().back()); |
Mr4D (OOO till 08-26)
2014/10/03 23:26:18
Are you sure this works now as intended? I have a
Mr4D (OOO till 08-26)
2014/10/08 14:06:28
The way it is set up at the moment you cannot remo
|
// After the Init() function returns, the passed |replaced_activity_| might |
// get destroyed. Since we do not need it anymore we reset it. |
replaced_activity_ = NULL; |