| Index: chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
|
| diff --git a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
|
| similarity index 51%
|
| copy from content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
|
| copy to chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
|
| index 2bc771fea723680455add70bf133796563e2b2ac..e051c1d323190b6c3f7c8fc13b350301b26e04ff 100644
|
| --- a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
|
| +++ b/chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h
|
| @@ -2,21 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_PEPPER_CONTENT_BROWSER_PEPPER_HOST_FACTORY_H_
|
| -#define CONTENT_BROWSER_PEPPER_CONTENT_BROWSER_PEPPER_HOST_FACTORY_H_
|
| +#ifndef CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
|
| +#define CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
|
|
|
| #include "base/compiler_specific.h"
|
| #include "ppapi/host/host_factory.h"
|
|
|
| namespace content {
|
| +class BrowserPpapiHost;
|
| +} // namespace content
|
|
|
| -class BrowserPpapiHostImpl;
|
| +namespace chrome {
|
|
|
| -class ContentBrowserPepperHostFactory : public ppapi::host::HostFactory {
|
| +class ChromeBrowserPepperHostFactory : public ppapi::host::HostFactory {
|
| public:
|
| // Non-owning pointer to the filter must outlive this class.
|
| - explicit ContentBrowserPepperHostFactory(BrowserPpapiHostImpl* host);
|
| - virtual ~ContentBrowserPepperHostFactory();
|
| + explicit ChromeBrowserPepperHostFactory(content::BrowserPpapiHost* host);
|
| + virtual ~ChromeBrowserPepperHostFactory();
|
|
|
| virtual scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost(
|
| ppapi::host::PpapiHost* host,
|
| @@ -26,11 +28,11 @@ class ContentBrowserPepperHostFactory : public ppapi::host::HostFactory {
|
|
|
| private:
|
| // Non-owning pointer.
|
| - BrowserPpapiHostImpl* host_;
|
| + content::BrowserPpapiHost* host_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ContentBrowserPepperHostFactory);
|
| + DISALLOW_COPY_AND_ASSIGN(ChromeBrowserPepperHostFactory);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace chrome
|
|
|
| -#endif // CONTENT_BROWSER_PEPPER_CONTENT_BROWSER_PEPPER_HOST_FACTORY_H_
|
| +#endif // CHROME_BROWSER_RENDERER_HOST_PEPPER_CHROME_BROWSER_PEPPER_HOST_FACTORY_H_
|
|
|