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;
 
@@ skipping 50 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) {
+      aura::Window* container = transient_parent->parent();
+      while (container && container->type() != ui::wm::WINDOW_TYPE_UNKNOWN)
+        container = container->parent();
+      return container;

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

can you check if the window has ContainerParams instead?

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

I just saw that there is a GetContainer() function defined above that does
exactly what we want here. There, it checks if parent of a window is root window
to decide if the window is a container or not. I updated the code here to use it
and also updated that function to check ContainerParams.

+    }
     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