diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 18:04:32 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 18:04:32 +0000 |
| commit | adab2337689e8be9e1298ac01278876b3468a823 (patch) | |
| tree | 1f0cf6b75255a9dec6e1fff2c3d9429a33f6e0f5 /content/renderer/pepper/mock_resource.h | |
| parent | e20a6c216c041e057ebccc5974ca9042796ff8a2 (diff) | |
| download | chromium_src-adab2337689e8be9e1298ac01278876b3468a823.zip chromium_src-adab2337689e8be9e1298ac01278876b3468a823.tar.gz chromium_src-adab2337689e8be9e1298ac01278876b3468a823.tar.bz2 | |
Put the pepper files which were moved in r213578 to the content namespace.
I added a "Pepper" prefix to WebPlugin and PluginInstance to avoid collision with the NPAPI versions.
BUG=263054
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/20358002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper/mock_resource.h')
| -rw-r--r-- | content/renderer/pepper/mock_resource.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/content/renderer/pepper/mock_resource.h b/content/renderer/pepper/mock_resource.h index 60531f0..fc6d0a8 100644 --- a/content/renderer/pepper/mock_resource.h +++ b/content/renderer/pepper/mock_resource.h @@ -7,8 +7,7 @@ #include "ppapi/shared_impl/resource.h" -namespace webkit { -namespace ppapi { +namespace content { // Tests can derive from this to implement special test-specific resources. // It's assumed that a test will only need one mock resource, so it can @@ -22,7 +21,6 @@ class MockResource : public ::ppapi::Resource { virtual ~MockResource() {} }; -} // namespace ppapi -} // namespace webkit +} // namespace content #endif // CONTENT_RENDERER_PEPPER_MOCK_RESOURCE_H_ |