cros: allow aura window not considered activatable for pointer event

ash/wm/ash_focus_rules.cc

 // Copyright (c) 2012 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 "ash/wm/ash_focus_rules.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/container_finder.h"
 #include "ash/wm/focus_rules.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm_window.h"
 #include "ui/aura/window.h"
+#include "ui/events/event.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
+// A property key to store whether activation on mouse click is enabled or not.
+DEFINE_UI_CLASS_PROPERTY_KEY(bool, kActivateOnClickKey, true);
+
 bool BelongsToContainerWithEqualOrGreaterId(const aura::Window* window,
                                             int container_id) {
   for (; window; window = window->parent()) {
     if (window->id() >= container_id)
       return true;
   }
   return false;
 }
 
 }  // namespace
 
+// static
+void AshFocusRules::SetActivateOnClick(aura::Window* window,
+                                       bool activate_on_click) {
+  DCHECK(window);
+  window->SetProperty(kActivateOnClickKey, activate_on_click);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AshFocusRules, public:
 
-AshFocusRules::AshFocusRules() {}
+AshFocusRules::AshFocusRules() = default;
 
-AshFocusRules::~AshFocusRules() {}
-
-bool AshFocusRules::IsWindowConsideredActivatable(aura::Window* window) const {
-  return ash::IsWindowConsideredActivatable(WmWindow::Get(window));
-}
+AshFocusRules::~AshFocusRules() = default;
 
 ////////////////////////////////////////////////////////////////////////////////
 // AshFocusRules, ::wm::FocusRules:
 
 bool AshFocusRules::IsToplevelWindow(aura::Window* window) const {
   return ash::IsToplevelWindow(WmWindow::Get(window));
 }
 
 bool AshFocusRules::SupportsChildActivation(aura::Window* window) const {
   return ash::IsActivatableShellWindowId(window->id());
@@ skipping 13 matching lines @@
     return false;
 
   if (ShellPort::Get()->IsSystemModalWindowOpen()) {
     return BelongsToContainerWithEqualOrGreaterId(
         window, kShellWindowId_SystemModalContainer);
   }
 
   return true;
 }
 
+bool AshFocusRules::IsWindowConsideredActivatableForEvent(
+    aura::Window* window,
+    ui::Event* event) const {
+  if (!window)
+    return true;
+
+  if (event->IsMouseEvent())

[oshima, 2017/04/11 20:54:40]

don't we need to filter other events such as touch/pointer?

[Qiang(Joe) Xu, 2017/04/12 19:00:02]

Touch event should be handled on OnGestureEvent. From the implementation in
FocusController, now I filter IsMouseEvent and IsGestureEvent here.

+    return window->GetProperty(kActivateOnClickKey);
+
+  return true;
+}
+
 aura::Window* AshFocusRules::GetNextActivatableWindow(
     aura::Window* ignore) const {
   DCHECK(ignore);
 
   // Start from the container of the most-recently-used window. If the list of
   // MRU windows is empty, then start from the container of the window that just
   // lost focus |ignore|.
   MruWindowTracker* mru = Shell::Get()->mru_window_tracker();
   std::vector<WmWindow*> windows = mru->BuildMruWindowList();
   aura::Window* starting_window =
@@ skipping 48 matching lines @@
     aura::Window* container,
     aura::Window* ignore) const {
   for (aura::Window::Windows::const_reverse_iterator i =
            container->children().rbegin();
        i != container->children().rend(); ++i) {
     WindowState* window_state = GetWindowState(*i);
     if (*i != ignore && window_state->CanActivate() &&
         !window_state->IsMinimized())
       return *i;
   }
-  return NULL;
+  return nullptr;
 }
 
 }  // namespace wm
 }  // namespace ash