| Index: content/renderer/compositor_bindings/web_scrollbar_layer_impl.h
|
| diff --git a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h b/content/renderer/compositor_bindings/web_scrollbar_layer_impl.h
|
| similarity index 70%
|
| rename from webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h
|
| rename to content/renderer/compositor_bindings/web_scrollbar_layer_impl.h
|
| index 31cc87ae9711e3a81399f325004e139b1bb9cb96..13866e77d8e8f0c0e53697fc53e801974a77fca2 100644
|
| --- a/webkit/renderer/compositor_bindings/web_scrollbar_layer_impl.h
|
| +++ b/content/renderer/compositor_bindings/web_scrollbar_layer_impl.h
|
| @@ -2,30 +2,30 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLLBAR_LAYER_IMPL_H_
|
| -#define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLLBAR_LAYER_IMPL_H_
|
| +#ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLLBAR_LAYER_IMPL_H_
|
| +#define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLLBAR_LAYER_IMPL_H_
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebScrollbar.h"
|
| #include "third_party/WebKit/public/platform/WebScrollbarLayer.h"
|
| -#include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export.h"
|
|
|
| namespace blink {
|
| class WebScrollbarThemeGeometry;
|
| class WebScrollbarThemePainter;
|
| }
|
|
|
| -namespace webkit {
|
| +namespace content {
|
|
|
| class WebLayerImpl;
|
|
|
| class WebScrollbarLayerImpl : public blink::WebScrollbarLayer {
|
| public:
|
| - WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebScrollbarLayerImpl(
|
| + CONTENT_EXPORT WebScrollbarLayerImpl(
|
| blink::WebScrollbar* scrollbar,
|
| blink::WebScrollbarThemePainter painter,
|
| blink::WebScrollbarThemeGeometry* geometry);
|
| - WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebScrollbarLayerImpl(
|
| + CONTENT_EXPORT WebScrollbarLayerImpl(
|
| blink::WebScrollbar::Orientation orientation,
|
| int thumb_thickness,
|
| int track_start,
|
| @@ -43,6 +43,6 @@ class WebScrollbarLayerImpl : public blink::WebScrollbarLayer {
|
| DISALLOW_COPY_AND_ASSIGN(WebScrollbarLayerImpl);
|
| };
|
|
|
| -} // namespace webkit
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLLBAR_LAYER_IMPL_H_
|
| +#endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_SCROLLBAR_LAYER_IMPL_H_
|
|
|