Make the FindInPageController implement its own delegate interface for

RenderViewHost so that we can get rid of the pass-throughs in WebContents.

I removed some redundant checks in WebContents when calling view() for
render_view_host() since that internally checks the null-ness of
render_view_host().

BUG=1323267


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@881 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 11 deletions

diff --git a/chrome/browser/render_view_host_delegate.h b/chrome/browser/render_view_host_delegate.h
index b80d328..959f427 100644
--- a/chrome/browser/render_view_host_delegate.h
+++ b/chrome/browser/render_view_host_delegate.h
@@ -72,6 +72,19 @@ enum LoadState;
 //
 class RenderViewHostDelegate {
  public:
+  class FindInPage {
+   public:
+    // A find operation in the current page completed.
+    virtual void FindReply(int request_id,
+                           int number_of_matches,
+                           const gfx::Rect& selection_rect,
+                           int active_match_ordinal,
+                           bool final_update) = 0;
+  };
+
+  // Returns the current find in page delegate, if any.
+  virtual FindInPage* GetFindInPageDelegate() { return NULL; }
+
   // Retrieves the profile to be used.
   virtual Profile* GetProfile() const = 0;
 
@@ -167,21 +180,10 @@ class RenderViewHostDelegate {
       const GURL& url,
       bool showing_repost_interstitial) { }
 
-  // A find operation in the current page completed.
-  virtual void FindReply(int request_id,
-                         int number_of_matches,
-                         const gfx::Rect& selection_rect,
-                         int active_match_ordinal,
-                         bool final_update) { }
-
   // The URL for the FavIcon of a page has changed.
   virtual void UpdateFavIconURL(RenderViewHost* render_view_host,
                                 int32 page_id, const GURL& icon_url) { }
 
-  // The FavIcon for a page needs to be downloaded.
-  virtual void DownloadFavIcon(RenderViewHost* render_view_host,
-                               int32 page_id) { }
-
   // An image that was requested to be downloaded by DownloadImage has
   // completed.
   virtual void DidDownloadImage(RenderViewHost* render_view_host,