Fix touch selection for Athena home card

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 102 matching lines @@
     if (!home_card_) {
       home_card_ = child;
       Layout(false);
     }
   }
   virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {
     if (home_card_ == child)
       home_card_ = NULL;
   }
   virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {
-    Layout(false);
+    if (!home_card_ || home_card_ == child)

[oshima, 2014/09/04 00:23:35]

why !home_card_ ? Layout is no-op when it's NULL.

[Jun Mukai, 2014/09/04 00:31:58]

This method can simply be empty instead. Anyways, home_card_ must be NULL in
this case because it's reset above OnWillRemoveWindowFromLayout().

[mohsen, 2014/09/04 14:57:22]

Yep, this function is no-op in any case. Removed contents.

+      Layout(false);
   }
   virtual void OnChildWindowVisibilityChanged(aura::Window* child,
                                               bool visible) OVERRIDE {
-    Layout(false);
+    if (home_card_ == child)
+      Layout(false);
   }
   virtual void SetChildBounds(aura::Window* child,
                               const gfx::Rect& requested_bounds) OVERRIDE {
     SetChildBoundsDirect(child, requested_bounds);
   }
 
   aura::Window* home_card_;
   ui::Layer* minimized_layer_;
 
   DISALLOW_COPY_AND_ASSIGN(HomeCardLayoutManager);
@@ skipping 315 matching lines @@
   instance = NULL;
 }
 
 // static
 HomeCard* HomeCard::Get() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena