Fix touch selection for Athena home card

athena/screen/screen_manager_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/screen/public/screen_manager.h"
 
 #include "athena/common/container_priorities.h"
 #include "athena/common/fill_layout_manager.h"
 #include "athena/input/public/accelerator_manager.h"
 #include "athena/screen/background_controller.h"
 #include "athena/screen/screen_accelerator_handler.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/aura/window_targeter.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/focus_controller.h"
+#include "ui/wm/core/window_util.h"
 
 namespace athena {
 namespace {
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ScreenManager::ContainerParams,
                                  kContainerParamsKey,
                                  NULL);
 
 ScreenManager* instance = NULL;
 
 bool GrabsInput(aura::Window* container) {
   ScreenManager::ContainerParams* params =
       container->GetProperty(kContainerParamsKey);
   return params && params->grab_inputs;
 }
 
 // Returns the container which contains |window|.
 aura::Window* GetContainer(aura::Window* window) {
-  // No containers for NULL or the root window itself.
-  if (!window || !window->parent())
+  if (!window)
     return NULL;
-  if (window->parent()->IsRootWindow())
+  if (window->GetProperty(kContainerParamsKey))
     return window;
   return GetContainer(window->parent());

[oshima, 2014/09/04 15:04:53]

this is not your fault, but you can change to use loop instead of recursion?

[mohsen, 2014/09/04 15:39:54]

Sure; Done.

 }
 
 class AthenaFocusRules : public wm::BaseFocusRules {
  public:
   AthenaFocusRules() {}
   virtual ~AthenaFocusRules() {}
 
   // wm::BaseFocusRules:
   virtual bool SupportsChildActivation(aura::Window* window) const OVERRIDE {
     ScreenManager::ContainerParams* params =
@@ skipping 26 matching lines @@
   explicit AthenaWindowTreeClient(aura::Window* container)
       : container_(container) {}
 
  private:
   virtual ~AthenaWindowTreeClient() {}
 
   // aura::client::WindowTreeClient:
   virtual aura::Window* GetDefaultParent(aura::Window* context,
                                          aura::Window* window,
                                          const gfx::Rect& bounds) OVERRIDE {
+    aura::Window* transient_parent = wm::GetTransientParent(window);
+    if (transient_parent)
+      return GetContainer(transient_parent);
     return container_;
   }
 
   aura::Window* container_;
 
   DISALLOW_COPY_AND_ASSIGN(AthenaWindowTreeClient);
 };
 
 class AthenaScreenPositionClient : public aura::client::ScreenPositionClient {
  public:
@@ skipping 276 matching lines @@
 }
 
 // static
 void ScreenManager::Shutdown() {
   DCHECK(instance);
   delete instance;
   DCHECK(!instance);
 }
 
 }  // namespace athena