diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 21:28:05 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-18 21:28:05 +0000 |
| commit | ae4efe42b48b651afc569537aca438c876cf7564 (patch) | |
| tree | 990901ce745227abf74334d11e9d176b2e39ff6d /content | |
| parent | 1c3412c0cae171231da8a17d41d48694473b567a (diff) | |
| download | chromium_src-ae4efe42b48b651afc569537aca438c876cf7564.zip chromium_src-ae4efe42b48b651afc569537aca438c876cf7564.tar.gz chromium_src-ae4efe42b48b651afc569537aca438c876cf7564.tar.bz2 | |
Make icon_messages use the IPC macros for defining the structs and the serialization code, and move the icon messages there. Also get rid of friend class in RenderView that's not needed anymore.
Review URL: http://codereview.chromium.org/6883020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_view_host.cc | 3 | ||||
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 3 | ||||
| -rw-r--r-- | content/renderer/render_view.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index 920d462..d5eb8c9 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -22,6 +22,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_messages.h" +#include "chrome/common/icon_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" #include "chrome/common/spellcheck_messages.h" @@ -571,7 +572,7 @@ int RenderViewHost::DownloadFavicon(const GURL& url, int image_size) { } static int next_id = 1; int id = next_id++; - Send(new ViewMsg_DownloadFavicon(routing_id(), id, url, image_size)); + Send(new IconMsg_DownloadFavicon(routing_id(), id, url, image_size)); return id; } diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index e7071e3..ef69769 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -58,6 +58,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/url_pattern.h" +#include "chrome/common/icon_messages.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" @@ -415,7 +416,7 @@ bool TabContents::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(ViewHostMsg_PDFHasUnsupportedFeature, OnPDFHasUnsupportedFeature) IPC_MESSAGE_HANDLER(ViewHostMsg_GoToEntryAtOffset, OnGoToEntryAtOffset) - IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFaviconURL, OnUpdateFaviconURL) + IPC_MESSAGE_HANDLER(IconHostMsg_UpdateFaviconURL, OnUpdateFaviconURL) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP_EX() diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h index 3292a37..2e56b83 100644 --- a/content/renderer/render_view.h +++ b/content/renderer/render_view.h @@ -615,9 +615,6 @@ class RenderView : public RenderWidget, virtual void OnWasRestored(bool needs_repainting); private: - // TODO(jam): temporary friend class to ease with the file move. Remove soon. - friend class chrome::ChromeContentRendererClient; - // For unit tests. friend class ExternalPopupMenuTest; friend class PepperDeviceTest; |