Remove unused code in AppActivityProxy

athena/content/app_activity_proxy.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/content/app_activity_proxy.h"
 
 #include "athena/content/app_activity.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"
-#include "ui/wm/core/window_util.h"
 
 namespace athena {
 
 AppActivityProxy::AppActivityProxy(AppActivity* replaced_activity,
                                    AppActivityRegistry* creator) :
     app_activity_registry_(creator),
     title_(replaced_activity->GetActivityViewModel()->GetTitle()),
     color_(replaced_activity->GetActivityViewModel()->GetRepresentativeColor()),
     replaced_activity_(replaced_activity),
     view_(new views::View()) {
@@ skipping 37 matching lines @@
 }
 
 void AppActivityProxy::Init() {
   DCHECK(replaced_activity_);
   // Get the content proxy to present the content.
   content_proxy_ = replaced_activity_->GetContentProxy();
   WindowListProvider* window_list_provider =
       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 browser test queued to test
this condition. Please wait...

[Mr4D (OOO till 08-26), 2014/10/08 14:06:28]

The way it is set up at the moment you cannot remove it without breaking certain
situations. However - after my browser test and other fixes have landed this can
be removed.

Problem: When the system is bogged down (over 90% resources used), you go into
overview mode and you select a previous application activity, it will not show,
but the app behind will (which is caused by the fact that the proxy's
destruction will cause an activation change).

   // 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;
 }
 
 SkColor AppActivityProxy::GetRepresentativeColor() const {
   return color_;
 }
 
 base::string16 AppActivityProxy::GetTitle() const {
@@ skipping 20 matching lines @@
   return content_proxy_->GetContentImage();
 }
 
 void AppActivityProxy::PrepareContentsForOverview() {
 }
 
 void AppActivityProxy::ResetContentsView() {
 }
 
 }  // namespace athena