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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: athena/home/home_card_impl.cc

Issue 414903002: Introduce 'grab_inputs' property for athena container. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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
« no previous file with comments | « athena/athena.gyp ('k') | athena/screen/public/screen_manager.h » ('j') | athena/screen/screen_manager_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/home/home_card_impl.cc
diff --git a/athena/home/home_card_impl.cc b/athena/home/home_card_impl.cc
index 2bf8d50d982d1b832380c21ee7ed18e44d872e94..e270bb4c4e723b95876cd355d64cafcae0d806c9 100644
--- a/athena/home/home_card_impl.cc
+++ b/athena/home/home_card_impl.cc
@@ -239,8 +239,10 @@ class HomeCardImpl : public HomeCard,
// aura::client::ActivationChangeObserver:
virtual void OnWindowActivated(aura::Window* gained_active,
aura::Window* lost_active) OVERRIDE {
- if (gained_active != home_card_widget_->GetNativeWindow())
+ if (state_ != HIDDEN &&
+ gained_active != home_card_widget_->GetNativeWindow()) {
SetState(VISIBLE_MINIMIZED);
+ }
}
scoped_ptr<AppModelBuilder> model_builder_;
« no previous file with comments | « athena/athena.gyp ('k') | athena/screen/public/screen_manager.h » ('j') | athena/screen/screen_manager_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698