diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 01:10:15 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 01:10:15 +0000 |
| commit | 359dfa3e661f583b6f564b6a14025fd0e2a6b669 (patch) | |
| tree | 97e6c0f60069c2a1ad51cd950972fa023301c82f /content/renderer | |
| parent | bd868f4a83aa3b69e699a195edd92a55af5b8f6a (diff) | |
| download | chromium_src-359dfa3e661f583b6f564b6a14025fd0e2a6b669.zip chromium_src-359dfa3e661f583b6f564b6a14025fd0e2a6b669.tar.gz chromium_src-359dfa3e661f583b6f564b6a14025fd0e2a6b669.tar.bz2 | |
Move ResourceDispatcherHostDelegate to content\public\common. I've added a set delegate function on ChildThread (which will soon be on content::ChildThread interface) so that we don't have to expose ResourceDispatcher to embedders.
BUG=98716
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=104832
Review URL: http://codereview.chromium.org/8224019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 10 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.h | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index f1089b7..9aa51ac 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -30,6 +30,7 @@ #include "content/common/npobject_util.h" #include "content/common/plugin_messages.h" #include "content/common/renderer_preferences.h" +#include "content/common/resource_dispatcher.h" #include "content/common/resource_messages.h" #include "content/common/view_messages.h" #include "content/common/web_database_observer_impl.h" @@ -340,10 +341,6 @@ IPC::SyncChannel* RenderThreadImpl::GetChannel() { return channel(); } -ResourceDispatcher* RenderThreadImpl::GetResourceDispatcher() { - return resource_dispatcher(); -} - std::string RenderThreadImpl::GetLocale() { // The browser process should have passed the locale to the renderer via the // --lang command line flag. In single process mode, this will return the @@ -389,6 +386,11 @@ void RenderThreadImpl::RemoveObserver( observers_.RemoveObserver(observer); } +void RenderThreadImpl::SetResourceDispatcherDelegate( + content::ResourceDispatcherDelegate* delegate) { + resource_dispatcher()->set_delegate(delegate); +} + void RenderThreadImpl::WidgetHidden() { DCHECK(hidden_widget_count_ < widget_count_); hidden_widget_count_++; diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index 092dcb4..e4d498a 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -93,7 +93,6 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread, virtual bool Send(IPC::Message* msg) OVERRIDE; virtual MessageLoop* GetMessageLoop() OVERRIDE; virtual IPC::SyncChannel* GetChannel() OVERRIDE; - virtual ResourceDispatcher* GetResourceDispatcher() OVERRIDE; virtual std::string GetLocale() OVERRIDE; virtual void AddRoute(int32 routing_id, IPC::Channel::Listener* listener) OVERRIDE; @@ -105,6 +104,8 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread, virtual void AddObserver(content::RenderProcessObserver* observer) OVERRIDE; virtual void RemoveObserver( content::RenderProcessObserver* observer) OVERRIDE; + virtual void SetResourceDispatcherDelegate( + content::ResourceDispatcherDelegate* delegate) OVERRIDE; virtual void WidgetHidden() OVERRIDE; virtual void WidgetRestored() OVERRIDE; virtual void EnsureWebKitInitialized() OVERRIDE; |