diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 20:56:07 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 20:56:07 +0000 |
commit | b3f8f972529f71cb9e16567b1ea296b7de7bc0a8 (patch) | |
tree | a3a9e8566d9262ab442c4c058581001d0cf5fad9 /webkit | |
parent | 13aba566502ed889c8dd59f0f571e7e68d7ba6af (diff) | |
download | chromium_src-b3f8f972529f71cb9e16567b1ea296b7de7bc0a8.zip chromium_src-b3f8f972529f71cb9e16567b1ea296b7de7bc0a8.tar.gz chromium_src-b3f8f972529f71cb9e16567b1ea296b7de7bc0a8.tar.bz2 |
Move P2P code to content namespace.
BUG=None
TEST=Compiles
Review URL: http://codereview.chromium.org/7715020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.cc | 2 | ||||
-rw-r--r-- | webkit/plugins/ppapi/mock_plugin_delegate.h | 2 | ||||
-rw-r--r-- | webkit/plugins/ppapi/plugin_delegate.h | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc index dab69dc..c34643a 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.cc +++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc @@ -259,7 +259,7 @@ void MockPluginDelegate::SetContentRestriction(int restrictions) { void MockPluginDelegate::SaveURLAs(const GURL& url) { } -P2PSocketDispatcher* MockPluginDelegate::GetP2PSocketDispatcher() { +content::P2PSocketDispatcher* MockPluginDelegate::GetP2PSocketDispatcher() { return NULL; } diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.h b/webkit/plugins/ppapi/mock_plugin_delegate.h index 8a4be75..04382e0 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.h +++ b/webkit/plugins/ppapi/mock_plugin_delegate.h @@ -112,7 +112,7 @@ class MockPluginDelegate : public PluginDelegate { virtual void DidStopLoading(); virtual void SetContentRestriction(int restrictions); virtual void SaveURLAs(const GURL& url); - virtual P2PSocketDispatcher* GetP2PSocketDispatcher(); + virtual content::P2PSocketDispatcher* GetP2PSocketDispatcher(); virtual webkit_glue::P2PTransport* CreateP2PTransport(); virtual double GetLocalTimeZoneOffset(base::Time t); virtual std::string GetFlashCommandLineArgs(); diff --git a/webkit/plugins/ppapi/plugin_delegate.h b/webkit/plugins/ppapi/plugin_delegate.h index c0bb662..9ec1829 100644 --- a/webkit/plugins/ppapi/plugin_delegate.h +++ b/webkit/plugins/ppapi/plugin_delegate.h @@ -29,7 +29,6 @@ class AudioMessageFilter; class GURL; -class P2PSocketDispatcher; class SkBitmap; namespace base { @@ -37,6 +36,10 @@ class MessageLoopProxy; class Time; } +namespace content { +class P2PSocketDispatcher; +} + namespace fileapi { class FileSystemCallbackDispatcher; } @@ -426,7 +429,7 @@ class PluginDelegate { // // TODO(sergeyu): Stop using GetP2PSocketDispatcher() in remoting // client and remove it from here. - virtual P2PSocketDispatcher* GetP2PSocketDispatcher() = 0; + virtual content::P2PSocketDispatcher* GetP2PSocketDispatcher() = 0; // Creates P2PTransport object. virtual webkit_glue::P2PTransport* CreateP2PTransport() = 0; |