Allow MimeHandlerViewGuest to be notified of StopFinding events.

Currently we notify the guest of StartFind events but not StopFinding.

BUG=455079

Review URL: https://codereview.chromium.org/901833002

Cr-Commit-Position: refs/heads/master@{#314939}

content/browser/browser_plugin/browser_plugin_embedder.cc

@@ -174,6 +174,12 @@ bool BrowserPluginEmbedder::Find(int request_id,
                  options));
 }
 
+bool BrowserPluginEmbedder::StopFinding(StopFindAction action) {
+  return GetBrowserPluginGuestManager()->ForEachGuest(
+      GetWebContents(),
+      base::Bind(&BrowserPluginEmbedder::StopFindingInGuest, action));
+}
+
 // static
 bool BrowserPluginEmbedder::UnlockMouseIfNecessaryCallback(bool* mouse_unlocked,
                                                            WebContents* guest) {
@@ -200,4 +206,15 @@ bool BrowserPluginEmbedder::FindInGuest(int request_id,
   return false;
 }
 
+bool BrowserPluginEmbedder::StopFindingInGuest(StopFindAction action,
+                                               WebContents* guest) {
+  if (static_cast<WebContentsImpl*>(guest)->GetBrowserPluginGuest()
+          ->StopFinding(action)) {
+    // There can only ever currently be one browser plugin that handles find so
+    // we can break the iteration at this point.
+    return true;
+  }
+  return false;
+}
+
 }  // namespace content

content/browser/browser_plugin/browser_plugin_embedder.h

@@ -75,6 +75,7 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
   bool Find(int request_id,
             const base::string16& search_text,
             const blink::WebFindOptions& options);
+  bool StopFinding(StopFindAction action);
 
  private:
   explicit BrowserPluginEmbedder(WebContentsImpl* web_contents);
@@ -92,6 +93,8 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
                           const base::string16& search_text,
                           const blink::WebFindOptions& options,
                           WebContents* guest);
+  static bool StopFindingInGuest(StopFindAction action, WebContents* guest);
+
   // Message handlers.
   void OnAttach(int instance_id,
                 const BrowserPluginHostMsg_Attach_Params& params);

content/browser/browser_plugin/browser_plugin_guest.cc

@@ -384,6 +384,10 @@ bool BrowserPluginGuest::Find(int request_id,
   return delegate_->Find(request_id, search_text, options);
 }
 
+bool BrowserPluginGuest::StopFinding(StopFindAction action) {
+  return delegate_->StopFinding(action);
+}
+
 WebContentsImpl* BrowserPluginGuest::GetWebContents() const {
   return static_cast<WebContentsImpl*>(web_contents());
 }

content/browser/browser_plugin/browser_plugin_guest.h

@@ -219,6 +219,7 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestSizer,
   bool Find(int request_id,
             const base::string16& search_text,
             const blink::WebFindOptions& options);
+  bool StopFinding(StopFindAction action);
 
  private:
   class EmbedderVisibilityObserver;

content/browser/web_contents/web_contents_impl.cc

@@ -2479,6 +2479,11 @@ void WebContentsImpl::Find(int request_id,
 }
 
 void WebContentsImpl::StopFinding(StopFindAction action) {
+  // See if a top level browser plugin handles the stop finding request first.
+  if (browser_plugin_embedder_ &&
+      browser_plugin_embedder_->StopFinding(action)) {
+    return;
+  }
   Send(new ViewMsg_StopFinding(GetRoutingID(), action));
 }
 

content/public/browser/browser_plugin_guest_delegate.cc

@@ -26,4 +26,8 @@ bool BrowserPluginGuestDelegate::Find(int request_id,
   return false;
 }
 
+bool BrowserPluginGuestDelegate::StopFinding(StopFindAction action) {
+  return false;
+}
+
 }  // namespace content

content/public/browser/browser_plugin_guest_delegate.h

@@ -80,6 +80,7 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
   virtual bool Find(int request_id,
                     const base::string16& search_text,
                     const blink::WebFindOptions& options);
+  virtual bool StopFinding(StopFindAction action);
 
   // Provides the delegate with an interface with which to size the guest.
   virtual void SetGuestSizer(GuestSizer* guest_sizer) {}

extensions/browser/api/web_view/web_view_internal_api.cc

@@ -244,7 +244,7 @@ bool WebViewInternalFindFunction::RunAsyncSafe(WebViewGuest* guest) {
         params->options->match_case ? *params->options->match_case : false;
   }
 
-  guest->StartFinding(search_text, options, this);
+  guest->StartFindInternal(search_text, options, this);
   return true;
 }
 
@@ -275,7 +275,7 @@ bool WebViewInternalStopFindingFunction::RunAsyncSafe(WebViewGuest* guest) {
       action = content::STOP_FIND_ACTION_KEEP_SELECTION;
   }
 
-  guest->StopFinding(action);
+  guest->StopFindingInternal(action);
   return true;
 }
 

extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc

@@ -173,6 +173,14 @@ bool MimeHandlerViewGuest::Find(int request_id,
   return false;
 }
 
+bool MimeHandlerViewGuest::StopFinding(content::StopFindAction action) {
+  if (is_full_page_plugin()) {
+    web_contents()->StopFinding(action);
+    return true;
+  }
+  return false;
+}
+
 content::WebContents* MimeHandlerViewGuest::OpenURLFromTab(
     content::WebContents* source,
     const content::OpenURLParams& params) {

extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h

@@ -74,6 +74,7 @@ class MimeHandlerViewGuest : public GuestView<MimeHandlerViewGuest>,
   bool Find(int request_id,
             const base::string16& search_text,
             const blink::WebFindOptions& options) override;
+  bool StopFinding(content::StopFindAction action) override;
 
   // WebContentsDelegate implementation.
   content::WebContents* OpenURLFromTab(

extensions/browser/guest_view/web_view/web_view_guest.cc

@@ -557,14 +557,14 @@ void WebViewGuest::Observe(int type,
   }
 }
 
-void WebViewGuest::StartFinding(
+void WebViewGuest::StartFindInternal(
     const base::string16& search_text,
     const blink::WebFindOptions& options,
     scoped_refptr<WebViewInternalFindFunction> find_function) {
   find_helper_.Find(web_contents(), search_text, options, find_function);
 }
 
-void WebViewGuest::StopFinding(content::StopFindAction action) {
+void WebViewGuest::StopFindingInternal(content::StopFindAction action) {
   find_helper_.CancelAllFindSessions();
   web_contents()->StopFinding(action);
 }

extensions/browser/guest_view/web_view/web_view_guest.h

@@ -169,12 +169,13 @@ class WebViewGuest : public GuestView<WebViewGuest>,
   double zoom() const { return current_zoom_factor_; }
 
   // Begin or continue a find request.
-  void StartFinding(const base::string16& search_text,
-                    const blink::WebFindOptions& options,
-                    scoped_refptr<WebViewInternalFindFunction> find_function);
+  void StartFindInternal(
+      const base::string16& search_text,
+      const blink::WebFindOptions& options,
+      scoped_refptr<WebViewInternalFindFunction> find_function);
 
   // Conclude a find request to clear highlighting.
-  void StopFinding(content::StopFindAction);
+  void StopFindingInternal(content::StopFindAction);
 
   // If possible, navigate the guest to |relative_index| entries away from the
   // current navigation entry. Returns true on success.