Move find-in-page code from RenderView to RenderFrame.

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index b6e54b8cf9c16e720353c3f1b1c33c45f9855407..d3fcbc652b0422ce3b6e6e0f3fe996309c65588f 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -36,7 +36,6 @@
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/referrer.h"
 #include "content/public/common/renderer_preferences.h"
-#include "content/public/common/stop_find_action.h"
 #include "content/public/common/top_controls_state.h"
 #include "content/public/common/web_preferences.h"
 #include "content/public/renderer/render_view.h"
@@ -248,14 +247,6 @@ class CONTENT_EXPORT RenderViewImpl
   // Plugin-related functions --------------------------------------------------
 
 #if defined(ENABLE_PLUGINS)
-  // Get/set the plugin which will be used as to handle document find requests.
-  void set_plugin_find_handler(PepperPluginInstanceImpl* plugin) {
-    plugin_find_handler_ = plugin;
-  }
-  PepperPluginInstanceImpl* plugin_find_handler() {
-    return plugin_find_handler_;
-  }
-
   PepperPluginInstanceImpl* focused_pepper_plugin() {
     return focused_pepper_plugin_;
   }
@@ -506,7 +497,6 @@ class CONTENT_EXPORT RenderViewImpl
   void DidCompletePageScaleAnimation() override;
   void OnDeviceScaleFactorChanged() override;
 
- protected:

[nasko, 2016/01/20 21:43:32]

Why was "protected" removed? The following methods don't seem to be suitable to
be public.

[paulmeyer, 2016/01/20 22:54:15]

Hahahaha, I did this long enough ago that I didn't remember doing it, and I was
super confused when I saw this. I couldn't figure out why I would ever just go
and remove the protected label out of a class. After revealing a number of lines
above this though, I noticed why. As it turns out, it was because these methods
are ALREADY protected. :P

   RenderViewImpl(CompositorDependencies* compositor_deps,
                  const ViewMsg_New_Params& params);
 
@@ -656,9 +646,6 @@ class CONTENT_EXPORT RenderViewImpl
                                     const std::vector<base::FilePath>& paths);
   void OnFileChooserResponse(
       const std::vector<content::FileChooserFileInfo>& files);
-  void OnFind(int request_id,
-              const base::string16&,
-              const blink::WebFindOptions&);
   void OnMediaPlayerActionAt(const gfx::Point& location,
                              const blink::WebMediaPlayerAction& action);
   void OnPluginActionAt(const gfx::Point& location,
@@ -676,7 +663,6 @@ class CONTENT_EXPORT RenderViewImpl
   void OnSetWebUIProperty(const std::string& name, const std::string& value);
   void OnSetZoomLevelForLoadingURL(const GURL& url, double zoom_level);
   void OnSetZoomLevelForView(bool uses_temporary_zoom_level, double level);
-  void OnStopFinding(StopFindAction action);
   void OnSuppressDialogsUntilSwapOut();
   void OnThemeChanged();
   void OnUpdateTargetURLAck();
@@ -687,8 +673,6 @@ class CONTENT_EXPORT RenderViewImpl
   void OnForceRedraw(int request_id);
   void OnSelectWordAroundCaret();
 #if defined(OS_ANDROID)
-  void OnActivateNearestFindResult(int request_id, float x, float y);
-  void OnFindMatchRects(int current_version);
   void OnUndoScrollFocusedEditableNodeIntoRect();
   void OnUpdateTopControlsState(bool enable_hiding,
                                 bool enable_showing,
@@ -714,10 +698,6 @@ class CONTENT_EXPORT RenderViewImpl
   // Gets the currently focused element, if any.
   blink::WebElement GetFocusedElement() const;
 
-  // Called to get the WebPlugin to handle find requests in the document.
-  // Returns NULL if there is no such WebPlugin.
-  blink::WebPlugin* GetWebPluginForFind();
-
 #if defined(OS_ANDROID)
   // Launch an Android content intent with the given URL.
   void LaunchAndroidContentIntent(const GURL& intent_url,
@@ -725,14 +705,6 @@ class CONTENT_EXPORT RenderViewImpl
                                   bool is_main_frame);
 #endif
 
-  // Sends a reply to the current find operation handling if it was a
-  // synchronous find request.
-  void SendFindReply(int request_id,
-                     int match_count,
-                     int ordinal,
-                     const blink::WebRect& selection_rect,
-                     bool final_status_update);
-
 #if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MACOSX))
   void UpdateFontRenderingFromRendererPrefs();
 #else
@@ -978,8 +950,6 @@ class CONTENT_EXPORT RenderViewImpl
 #endif
 
 #if defined(ENABLE_PLUGINS)
-  PepperPluginInstanceImpl* plugin_find_handler_;
-
   typedef std::set<PepperPluginInstanceImpl*> PepperPluginSet;
   PepperPluginSet active_pepper_instances_;