Don't hide home card upon activation change

athena/home/home_card_impl.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/home/home_card_impl.h"
 
 #include <cmath>
 #include <limits>
 
 #include "athena/env/public/athena_env.h"
@@ skipping 10 matching lines @@
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/visibility_controller.h"
-#include "ui/wm/public/activation_client.h"
 
 namespace athena {
 namespace {
 
 HomeCard* instance = NULL;
 
 gfx::Rect GetBoundsForState(const gfx::Rect& screen_bounds,
                             HomeCard::State state) {
   switch (state) {
     case HomeCard::HIDDEN:
@@ skipping 180 matching lines @@
 };
 
 HomeCardImpl::HomeCardImpl(scoped_ptr<AppModelBuilder> model_builder,
                            scoped_ptr<SearchControllerFactory> search_factory)
     : model_builder_(model_builder.Pass()),
       search_factory_(search_factory.Pass()),
       state_(HIDDEN),
       original_state_(VISIBLE_MINIMIZED),
       home_card_widget_(NULL),
       home_card_view_(NULL),
-      layout_manager_(NULL),
-      activation_client_(NULL) {
+      layout_manager_(NULL) {
   DCHECK(!instance);
   instance = this;
   WindowManager::Get()->AddObserver(this);
 }
 
 HomeCardImpl::~HomeCardImpl() {
   DCHECK(instance);
   WindowManager::Get()->RemoveObserver(this);
-  if (activation_client_)
-    activation_client_->RemoveObserver(this);
   home_card_widget_->CloseNow();
 
   // Reset the view delegate first as it access search provider during
   // shutdown.
   view_delegate_.reset();
   instance = NULL;
 }
 
 void HomeCardImpl::Init() {
   InstallAccelerators();
@@ skipping 18 matching lines @@
   home_card_widget_->Init(widget_params);
 
   minimized_home_ = CreateMinimizedHome();
   container->layer()->Add(minimized_home_->layer());
   container->layer()->StackAtTop(minimized_home_->layer());
   layout_manager_->SetMinimizedLayer(minimized_home_->layer());
 
   SetState(VISIBLE_MINIMIZED);
   home_card_view_->Layout();
 
-  activation_client_ =
-      aura::client::GetActivationClient(container->GetRootWindow());
-  if (activation_client_)
-    activation_client_->AddObserver(this);
-
   AthenaEnv::Get()->SetDisplayWorkAreaInsets(
       gfx::Insets(0, 0, kHomeCardMinimizedHeight, 0));
 }
 
 aura::Window* HomeCardImpl::GetHomeCardWindowForTest() const {
   return home_card_widget_ ? home_card_widget_->GetNativeWindow() : NULL;
 }
 
 void HomeCardImpl::InstallAccelerators() {
   const AcceleratorData accelerator_data[] = {
@@ skipping 122 matching lines @@
 void HomeCardImpl::OnOverviewModeExit() {
   SetState(VISIBLE_MINIMIZED);
 }
 
 void HomeCardImpl::OnSplitViewModeEnter() {
 }
 
 void HomeCardImpl::OnSplitViewModeExit() {
 }
 
-void HomeCardImpl::OnWindowActivated(aura::Window* gained_active,
-                                     aura::Window* lost_active) {
-  if (state_ != HIDDEN &&
-      gained_active != home_card_widget_->GetNativeWindow()) {
-    SetState(VISIBLE_MINIMIZED);
-  }
-}
-
 // static
 HomeCard* HomeCard::Create(scoped_ptr<AppModelBuilder> model_builder,
                            scoped_ptr<SearchControllerFactory> search_factory) {
   (new HomeCardImpl(model_builder.Pass(), search_factory.Pass()))->Init();
   DCHECK(instance);
   return instance;
 }
 
 // static
 void HomeCard::Shutdown() {
   DCHECK(instance);
   delete instance;
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena