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

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

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun 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
« no previous file with comments | « content/renderer/pepper/ppb_proxy_impl.cc ('k') | content/renderer/pepper/ppb_scrollbar_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/ppb_scrollbar_impl.h
===================================================================
--- content/renderer/pepper/ppb_scrollbar_impl.h (revision 213482)
+++ content/renderer/pepper/ppb_scrollbar_impl.h (working copy)
@@ -2,19 +2,19 @@
// 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_SCROLLBAR_IMPL_H_
-#define WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_
+#ifndef CONTENT_RENDERER_PEPPER_PPB_SCROLLBAR_IMPL_H_
+#define CONTENT_RENDERER_PEPPER_PPB_SCROLLBAR_IMPL_H_
#include <vector>
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "content/renderer/pepper/ppb_widget_impl.h"
#include "ppapi/thunk/ppb_scrollbar_api.h"
#include "third_party/WebKit/public/platform/WebRect.h"
#include "third_party/WebKit/public/web/WebPluginScrollbarClient.h"
#include "ui/gfx/rect.h"
-#include "webkit/plugins/ppapi/ppb_widget_impl.h"
namespace webkit {
namespace ppapi {
@@ -25,11 +25,9 @@
public:
static PP_Resource Create(PP_Instance instance, bool vertical);
- virtual ~PPB_Scrollbar_Impl();
-
// Resource overrides.
virtual PPB_Scrollbar_API* AsPPB_Scrollbar_API() OVERRIDE;
- virtual void InstanceWasDeleted();
+ virtual void InstanceWasDeleted() OVERRIDE;
// PPB_Scrollbar_API implementation.
virtual uint32_t GetThickness() OVERRIDE;
@@ -41,6 +39,8 @@
virtual void ScrollBy(PP_ScrollBy_Dev unit, int32_t multiplier) OVERRIDE;
private:
+ virtual ~PPB_Scrollbar_Impl();
+
explicit PPB_Scrollbar_Impl(PP_Instance instance);
void Init(bool vertical);
@@ -75,4 +75,4 @@
} // namespace ppapi
} // namespace webkit
-#endif // WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_
+#endif // CONTENT_RENDERER_PEPPER_PPB_SCROLLBAR_IMPL_H_
« no previous file with comments | « content/renderer/pepper/ppb_proxy_impl.cc ('k') | content/renderer/pepper/ppb_scrollbar_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698