Make icon_messages use the IPC macros for defining the structs and the serialization code, and mo...

chrome/renderer/chrome_render_view_observer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_render_view_observer.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/icon_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/about_handler.h"
 #include "chrome/renderer/automation/dom_automation_controller.h"
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 #include "chrome/renderer/translate_helper.h"
 #include "content/common/bindings_policy.h"
 #include "content/common/view_messages.h"
@@ skipping 113 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_CaptureSnapshot, OnCaptureSnapshot)
     IPC_MESSAGE_HANDLER(ViewMsg_HandleMessageFromExternalHost,
                         OnHandleMessageFromExternalHost)
     IPC_MESSAGE_HANDLER(ViewMsg_JavaScriptStressTestControl,
                         OnJavaScriptStressTestControl)
     IPC_MESSAGE_HANDLER(ViewMsg_GetAllSavableResourceLinksForCurrentPage,
                         OnGetAllSavableResourceLinksForCurrentPage)
     IPC_MESSAGE_HANDLER(
         ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks,
         OnGetSerializedHtmlDataForCurrentPageWithLocalLinks)
-    IPC_MESSAGE_HANDLER(ViewMsg_DownloadFavicon, OnDownloadFavicon)
+    IPC_MESSAGE_HANDLER(IconMsg_DownloadFavicon, OnDownloadFavicon)
     IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   // Filter only.
   IPC_BEGIN_MESSAGE_MAP(ChromeRenderViewObserver, message)
     IPC_MESSAGE_HANDLER(ViewMsg_Navigate, OnNavigate)
   IPC_END_MESSAGE_MAP()
 
   return handled;
@@ skipping 86 matching lines @@
 }
 
 void ChromeRenderViewObserver::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_DidDownloadFavicon(
+      Send(new IconHostMsg_DidDownloadFavicon(
           routing_id(), id, image_url, false, data_image));
     }
   }
 
   if (data_image_failed ||
       !DownloadFavicon(id, image_url, image_size)) {
-    Send(new ViewHostMsg_DidDownloadFavicon(
+    Send(new IconHostMsg_DidDownloadFavicon(
         routing_id(), id, image_url, true, SkBitmap()));
   }
 }
 
 void ChromeRenderViewObserver::OnEnableViewSourceMode() {
   if (!render_view()->webview())
     return;
   WebFrame* main_frame = render_view()->webview()->mainFrame();
   if (!main_frame)
     return;
@@ skipping 30 matching lines @@
   if (!osd_url.is_empty()) {
     Send(new ViewHostMsg_PageHasOSDD(
         routing_id(), render_view()->page_id(), osd_url,
         search_provider::AUTODETECTED_PROVIDER));
   }
 
   // TODO : Get both favicon and touch icon url, and send them to the browser.
   GURL favicon_url(render_view()->webview()->mainFrame()->favIconURL());
   if (!favicon_url.is_empty()) {
     std::vector<FaviconURL> urls;
-    urls.push_back(FaviconURL(favicon_url, FAVICON));
-    Send(new ViewHostMsg_UpdateFaviconURL(
+    urls.push_back(FaviconURL(favicon_url, FaviconURL::FAVICON));
+    Send(new IconHostMsg_UpdateFaviconURL(
         routing_id(), render_view()->page_id(), urls));
   }
 }
 
 void ChromeRenderViewObserver::DidChangeIcons(WebFrame* frame) {
   if (frame->parent())
     return;
 
   std::vector<FaviconURL> urls;
-  urls.push_back(FaviconURL(frame->favIconURL(), FAVICON));
-  Send(new ViewHostMsg_UpdateFaviconURL(
+  urls.push_back(FaviconURL(frame->favIconURL(), FaviconURL::FAVICON));
+  Send(new IconHostMsg_UpdateFaviconURL(
       routing_id(), render_view()->page_id(), urls));
 }
 
 void ChromeRenderViewObserver::DidCommitProvisionalLoad(
     WebFrame* frame, bool is_new_navigation) {
   if (!is_new_navigation)
     return;
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
@@ skipping 245 matching lines @@
       new ImageResourceFetcher(
           image_url, render_view()->webview()->mainFrame(), id, image_size,
           WebURLRequest::TargetIsFavicon,
           NewCallback(this, &ChromeRenderViewObserver::DidDownloadFavicon))));
   return true;
 }
 
 void ChromeRenderViewObserver::DidDownloadFavicon(
     ImageResourceFetcher* fetcher, const SkBitmap& image) {
   // Notify requester of image download status.
-  Send(new ViewHostMsg_DidDownloadFavicon(routing_id(),
+  Send(new IconHostMsg_DidDownloadFavicon(routing_id(),
                                           fetcher->id(),
                                           fetcher->image_url(),
                                           image.isNull(),
                                           image));
 
   // Remove the image fetcher from our pending list. We're in the callback from
   // ImageResourceFetcher, best to delay deletion.
   RenderView::ImageResourceFetcherList::iterator iter;
   for (iter = image_fetchers_.begin(); iter != image_fetchers_.end(); ++iter) {
     if (iter->get() == fetcher) {
@@ skipping 10 matching lines @@
   if (net::DataURL::Parse(url, &mime_type, &char_set, &data) && !data.empty()) {
     // Decode the favicon using WebKit's image decoder.
     webkit_glue::ImageDecoder decoder(gfx::Size(kFaviconSize, kFaviconSize));
     const unsigned char* src_data =
         reinterpret_cast<const unsigned char*>(&data[0]);
 
     return decoder.Decode(src_data, data.size());
   }
   return SkBitmap();
 }