Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1891)

Unified Diff: content/renderer/pepper/ppb_broker_impl.h

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/pepper/ppb_broker_impl.h
===================================================================
--- content/renderer/pepper/ppb_broker_impl.h (revision 213482)
+++ content/renderer/pepper/ppb_broker_impl.h (working copy)
@@ -2,27 +2,25 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_
-#define WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_
+#ifndef CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_
+#define CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
+#include "content/renderer/pepper/plugin_delegate.h"
#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/trusted/ppb_broker_trusted.h"
#include "ppapi/shared_impl/resource.h"
#include "ppapi/shared_impl/tracked_callback.h"
#include "ppapi/thunk/ppb_broker_api.h"
-#include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/webkit_plugins_export.h"
namespace webkit {
namespace ppapi {
-class WEBKIT_PLUGINS_EXPORT PPB_Broker_Impl
- : public ::ppapi::Resource,
- NON_EXPORTED_BASE(public ::ppapi::thunk::PPB_Broker_API),
- public base::SupportsWeakPtr<PPB_Broker_Impl> {
+class PPB_Broker_Impl : public ::ppapi::Resource,
+ public ::ppapi::thunk::PPB_Broker_API,
+ public base::SupportsWeakPtr<PPB_Broker_Impl> {
public:
explicit PPB_Broker_Impl(PP_Instance instance);
virtual ~PPB_Broker_Impl();
@@ -59,4 +57,4 @@
} // namespace ppapi
} // namespace webkit
-#endif // WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_
+#endif // CONTENT_RENDERER_PEPPER_PPB_BROKER_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698