Ensure that an activity is activated when overview mode is exited

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/common/container_priorities.h"
@@ skipping 309 matching lines @@
       ui::ScopedLayerAnimationSettings settings(
           minimized_home_->layer()->GetAnimator());
       minimized_home_->layer()->SetVisible(state_ == VISIBLE_MINIMIZED);
       minimized_home_->layer()->SetOpacity(
           state_ == VISIBLE_MINIMIZED ? 1.0f : 0.0f);
     }
   }
   if (state_ == HIDDEN) {
     home_card_widget_->Hide();
   } else {
-    if (state_ == VISIBLE_CENTERED)
+    if (state_ == VISIBLE_MINIMIZED)
+      home_card_widget_->ShowInactive();
+    else
       home_card_widget_->Show();
-    else
-      home_card_widget_->ShowInactive();
     home_card_view_->SetStateWithAnimation(state);
     layout_manager_->Layout(true);
   }
 }
 
 HomeCard::State HomeCardImpl::GetState() {
   return state_;
 }
 
 void HomeCardImpl::RegisterSearchProvider(
@@ skipping 102 matching lines @@
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena