mash: Clean up AnswerCardWebContents deps

Move AppListView::ExcludeWindowFromEventHandling from browser process
to app list code in ash process.

Bug: 854787
Change-Id: I7509fdd8c5cc4ea0db211bdc4c7fe8715fb10660
Reviewed-on: https://chromium-review.googlesource.com/1170036
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#583075}

ash/app_list/views/app_list_view_unittest.cc

@@ -258,8 +258,8 @@ class AppListViewFocusTest : public views::ViewsTestBase,
         std::make_unique<AnswerCardContentsRegistry>();
     fake_answer_card_view_ = std::make_unique<views::View>();
     fake_answer_card_view_->set_owned_by_client();
-    fake_answer_card_token_ =
-        answer_card_contents_registry_->Register(fake_answer_card_view_.get());
+    fake_answer_card_token_ = answer_card_contents_registry_->Register(
+        fake_answer_card_view_.get(), /*contents_native_view=*/nullptr);
 
     // Initialize app list view.
     delegate_ = std::make_unique<AppListTestViewDelegate>();

ash/app_list/views/search_result_answer_card_view.cc

@@ -10,6 +10,7 @@
 
 #include "ash/app_list/app_list_metrics.h"
 #include "ash/app_list/app_list_view_delegate.h"
+#include "ash/app_list/views/app_list_view.h"
 #include "ash/app_list/views/search_result_base_view.h"
 #include "ash/public/cpp/app_list/answer_card_contents_registry.h"
 #include "ash/public/cpp/app_list/app_list_constants.h"
@@ -18,6 +19,7 @@
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_node_data.h"
+#include "ui/aura/window.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
@@ -56,6 +58,35 @@ views::View* GetViewByToken(
   return nullptr;
 }
 
+// If there is a card native view identified by |token| in
+// AnswerCardContentsRegistry, exclude it from event handling.
+void ExcludeFromEventHandlingByToken(
+    const base::Optional<base::UnguessableToken>& token) {
+  if (!AnswerCardContentsRegistry::Get())
+    return;
+
+  DCHECK(token.has_value() && !token->is_empty());
+  gfx::NativeView card_native_view =
+      AnswerCardContentsRegistry::Get()->GetNativeView(token.value());
+  // |card_native_view| could be null in tests.
+  if (!card_native_view)
+    return;
+
+  // |card_native_view| is brought into View's hierarchy via a NativeViewHost.
+  // The window hierarchy looks like this:
+  //   widget window -> clipping window -> content_native_view
+  // Events should be targeted to the widget window and by-passing the sub tree
+  // started at clipping window. Walking up the window hierarchy to find the
+  // clipping window and make the cut there.
+  aura::Window* top_level = card_native_view->GetToplevelWindow();
+  DCHECK(top_level);
+  aura::Window* window = card_native_view;
+  while (window->parent() != top_level)
+    window = window->parent();
+
+  AppListView::ExcludeWindowFromEventHandling(window);
+}
+
 }  // namespace
 
 // Container of the search answer view.
@@ -92,8 +123,10 @@ class SearchResultAnswerCardView::SearchAnswerContainerView
       RemoveAllChildViews(true /* delete_children */);
 
       result_view = GetViewByToken(new_token);
-      if (result_view)
+      if (result_view) {
         AddChildView(result_view);
+        ExcludeFromEventHandlingByToken(new_token);
+      }
     }
 
     base::string16 old_title;

ash/app_list/views/search_result_answer_card_view_unittest.cc

@@ -44,7 +44,8 @@ class SearchResultAnswerCardViewTest : public views::ViewsTestBase {
 
     result_view_ = std::make_unique<views::View>();
     result_view_->set_owned_by_client();
-    token_ = contents_registry_.Register(result_view_.get());
+    token_ = contents_registry_.Register(result_view_.get(),
+                                         /*contents_native_view=*/nullptr);
 
     SetUpSearchResult();
   }

ash/public/cpp/app_list/answer_card_contents_registry.cc

@@ -30,9 +30,10 @@ AnswerCardContentsRegistry* AnswerCardContentsRegistry::Get() {
 }
 
 base::UnguessableToken AnswerCardContentsRegistry::Register(
-    views::View* contents_view) {
+    views::View* contents_view,
+    gfx::NativeView contents_native_view) {
   const base::UnguessableToken token = base::UnguessableToken::Create();
-  contents_map_[token] = contents_view;
+  contents_map_[token] = {contents_view, contents_native_view};
   return token;
 }
 
@@ -51,7 +52,16 @@ views::View* AnswerCardContentsRegistry::GetView(
   if (it == contents_map_.end())
     return nullptr;
 
-  return it->second;
+  return it->second.view;
+}
+
+gfx::NativeView AnswerCardContentsRegistry::GetNativeView(
+    const base::UnguessableToken& token) {
+  auto it = contents_map_.find(token);
+  if (it == contents_map_.end())
+    return nullptr;
+
+  return it->second.native_view;
 }
 
 }  // namespace app_list

ash/public/cpp/app_list/answer_card_contents_registry.h

@@ -10,6 +10,7 @@
 #include "ash/public/cpp/ash_public_export.h"
 #include "base/macros.h"
 #include "base/unguessable_token.h"
+#include "ui/gfx/native_widget_types.h"
 
 namespace views {
 class View;
@@ -32,17 +33,24 @@ class ASH_PUBLIC_EXPORT AnswerCardContentsRegistry {
 
   static AnswerCardContentsRegistry* Get();
 
-  // Register content with a View.
-  base::UnguessableToken Register(views::View* contents_view);
+  // Register content with a View and its relevant NativeView.
+  base::UnguessableToken Register(views::View* contents_view,
+                                  gfx::NativeView contents_native_view);
 
   // Unregister and release the associated resources.
   void Unregister(const base::UnguessableToken& token);
 
   // Get the view for the given token. Return nullptr for unknown token.
   views::View* GetView(const base::UnguessableToken& token);
+  gfx::NativeView GetNativeView(const base::UnguessableToken& token);
 
  private:
-  std::map<base::UnguessableToken, views::View*> contents_map_;
+  struct Entry {
+    views::View* view;
+    gfx::NativeView native_view;
+  };
+
+  std::map<base::UnguessableToken, Entry> contents_map_;
 
   DISALLOW_COPY_AND_ASSIGN(AnswerCardContentsRegistry);
 };

chrome/browser/ui/app_list/search/answer_card/answer_card_web_contents.cc

@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "ash/app_list/views/app_list_view.h"
 #include "ash/public/cpp/app_list/answer_card_contents_registry.h"
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ -69,14 +68,6 @@ class SearchAnswerWebView : public views::WebView {
   void AddedToWidget() override {
     WebView::AddedToWidget();
 
-    // Find the root element that attached to the app list view.
-    aura::Window* const app_list_window =
-        web_contents()->GetTopLevelNativeWindow();
-    aura::Window* window = web_contents()->GetNativeView();
-    while (window->parent() != app_list_window)
-      window = window->parent();
-    AppListView::ExcludeWindowFromEventHandling(window);
-
     OnVisibilityEvent(false);
     // Focus Behavior is originally set in WebView::SetWebContents, but
     // overriden here because we do not want the webview to get focus.
@@ -173,7 +164,8 @@ AnswerCardWebContents::AnswerCardWebContents(Profile* profile)
     web_view_->SetWebContents(web_contents_.get());
     web_view_->SetResizeBackgroundColor(SK_ColorTRANSPARENT);
 
-    token_ = AnswerCardContentsRegistry::Get()->Register(web_view_.get());
+    token_ = AnswerCardContentsRegistry::Get()->Register(
+        web_view_.get(), web_contents_->GetNativeView());
   }
 }
 

chrome/browser/ui/ash/assistant/web_contents_manager.cc

@@ -153,7 +153,7 @@ class ManagedWebContents : public content::WebContentsDelegate,
       web_view_->SetWebContents(web_contents_.get());
 
       embed_token_ = app_list::AnswerCardContentsRegistry::Get()->Register(
-          web_view_.get());
+          web_view_.get(), web_contents_->GetNativeView());
     } else {
       // TODO(dmblack): Handle Mash case. https://crbug.com/854787.
     }