Split out some of the RVHDelegate functions into separate sub-classes. To limit

the scope, this patch just contains those delegate functions implemented only
by TabContents, plus the favicon functions implemented by the FavIconHelper.
The only changes are re-ordering and moving the functions, and changes in the
way that the functions are called through the new optional delegate.
Review URL: http://codereview.chromium.org/149239

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

2 files changed, 14 insertions, 13 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 58328f6..c960798 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -358,7 +358,7 @@ void RenderView::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewMsg_InsertText, OnInsertText)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
     IPC_MESSAGE_HANDLER(ViewMsg_SetupDevToolsClient, OnSetupDevToolsClient)
-    IPC_MESSAGE_HANDLER(ViewMsg_DownloadImage, OnDownloadImage)
+    IPC_MESSAGE_HANDLER(ViewMsg_DownloadFavIcon, OnDownloadFavIcon)
     IPC_MESSAGE_HANDLER(ViewMsg_ScriptEvalRequest, OnScriptEvalRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_CSSInsertRequest, OnCSSInsertRequest)
     IPC_MESSAGE_HANDLER(ViewMsg_AddMessageToConsole, OnAddMessageToConsole)
@@ -1988,27 +1988,28 @@ void RenderView::DidDownloadImage(int id,
                                   const GURL& image_url,
                                   bool errored,
                                   const SkBitmap& image) {
-  Send(new ViewHostMsg_DidDownloadImage(routing_id_, id, image_url, errored,
-                                        image));
+  Send(new ViewHostMsg_DidDownloadFavIcon(routing_id_, id, image_url, errored,
+                                          image));
 }
 
-
-void RenderView::OnDownloadImage(int id,
-                                 const GURL& image_url,
-                                 int image_size) {
+void RenderView::OnDownloadFavIcon(int id,
+                                   const GURL& image_url,
+                                   int image_size) {
   bool data_image_failed = false;
   if (image_url.SchemeIs("data")) {
     SkBitmap data_image = ImageFromDataUrl(image_url);
     data_image_failed = data_image.empty();
     if (!data_image_failed) {
-      Send(new ViewHostMsg_DidDownloadImage(routing_id_, id, image_url, false,
-                                            data_image));
+      Send(new ViewHostMsg_DidDownloadFavIcon(routing_id_, id, image_url, false,
+                                              data_image));
     }
   }
 
-  if (data_image_failed || !webview()->DownloadImage(id, image_url, image_size))
-    Send(new ViewHostMsg_DidDownloadImage(routing_id_, id, image_url, true,
-                                          SkBitmap()));
+  if (data_image_failed ||
+      !webview()->DownloadImage(id, image_url, image_size)) {
+    Send(new ViewHostMsg_DidDownloadFavIcon(routing_id_, id, image_url, true,
+                                            SkBitmap()));
+  }
 }
 
 SkBitmap RenderView::ImageFromDataUrl(const GURL& url) const {
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index fc01af9..49eb26d 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -509,7 +509,7 @@ class RenderView : public RenderWidget,
   void OnUpdateWebPreferences(const WebPreferences& prefs);
   void OnSetAltErrorPageURL(const GURL& gurl);
 
-  void OnDownloadImage(int id, const GURL& image_url, int image_size);
+  void OnDownloadFavIcon(int id, const GURL& image_url, int image_size);
 
   void OnGetApplicationInfo(int page_id);