Move webfallbackthemeengine_impl.* to content/child/

BUG=338338

Review URL: https://codereview.chromium.org/160023003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250930 0039d316-1c4b-4281-b951-d872f2087c98

webkit/child/webfallbackthemeengine_impl.cc → content/child/webfallbackthemeengine_impl.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/child/webfallbackthemeengine_impl.h"
+#include "content/child/webfallbackthemeengine_impl.h"
 
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
@@ -14,7 +14,7 @@ using blink::WebColor;
 using blink::WebRect;
 using blink::WebFallbackThemeEngine;
 
-namespace webkit_glue {
+namespace content {
 
 static ui::NativeTheme::Part NativeThemePart(
     WebFallbackThemeEngine::Part part) {
@@ -190,4 +190,4 @@ void WebFallbackThemeEngineImpl::paint(
                 native_theme_extra_params);
 }
 
-}  // namespace webkit_glue
+}  // namespace content

webkit/child/webfallbackthemeengine_impl.h → content/child/webfallbackthemeengine_impl.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_CHILD_WEBFALLBACKTHEMEENGINE_IMPL_H_
-#define WEBKIT_CHILD_WEBFALLBACKTHEMEENGINE_IMPL_H_
+#ifndef CONTENT_CHILD_WEBFALLBACKTHEMEENGINE_IMPL_H_
+#define CONTENT_CHILD_WEBFALLBACKTHEMEENGINE_IMPL_H_
 
-#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "third_party/WebKit/public/platform/WebFallbackThemeEngine.h"
-#include "webkit/child/webkit_child_export.h"
 
 namespace ui {
 class FallbackTheme;
 }
 
-namespace webkit_glue {
+namespace content {
 
-class WEBKIT_CHILD_EXPORT WebFallbackThemeEngineImpl :
-    NON_EXPORTED_BASE(public blink::WebFallbackThemeEngine) {
+class WebFallbackThemeEngineImpl : public blink::WebFallbackThemeEngine {
  public:
   WebFallbackThemeEngineImpl();
   virtual ~WebFallbackThemeEngineImpl();
@@ -37,6 +34,6 @@ class WEBKIT_CHILD_EXPORT WebFallbackThemeEngineImpl :
   DISALLOW_COPY_AND_ASSIGN(WebFallbackThemeEngineImpl);
 };
 
-}  // namespace webkit_glue
+}  // namespace content
 
-#endif  // WEBKIT_CHILD_WEBFALLBACKTHEMEENGINE_IMPL_H_
+#endif  // CONTENT_CHILD_WEBFALLBACKTHEMEENGINE_IMPL_H_

content/child/webkitplatformsupport_child_impl.h

@@ -6,8 +6,8 @@
 #define CONTENT_CHILD_WEBKITPLATFORMSUPPORT_CHILD_IMPL_H_
 
 #include "base/threading/thread_local_storage.h"
+#include "content/child/webfallbackthemeengine_impl.h"
 #include "content/common/content_export.h"
-#include "webkit/child/webfallbackthemeengine_impl.h"
 #include "webkit/child/webkit_child_export.h"
 #include "webkit/child/webkitplatformsupport_impl.h"
 
@@ -65,7 +65,7 @@ class CONTENT_EXPORT WebKitPlatformSupportChildImpl :
   static void DestroyCurrentThread(void*);
 
   WebThemeEngineImpl native_theme_engine_;
-  webkit_glue::WebFallbackThemeEngineImpl fallback_theme_engine_;
+  WebFallbackThemeEngineImpl fallback_theme_engine_;
   base::ThreadLocalStorage::Slot current_thread_slot_;
   scoped_ptr<webkit_glue::FlingCurveConfiguration> fling_curve_configuration_;
 };

content/content_child.gypi

@@ -165,6 +165,8 @@
     'child/websocket_bridge.h',
     'child/websocket_dispatcher.cc',
     'child/websocket_dispatcher.h',
+    'child/webfallbackthemeengine_impl.cc',
+    'child/webfallbackthemeengine_impl.h',
     'child/webthemeengine_impl_android.cc',
     'child/webthemeengine_impl_android.h',
     'child/webthemeengine_impl_default.cc',

webkit/child/webkit_child.gyp

@@ -68,8 +68,6 @@
         'resource_loader_bridge.h',
         'touch_fling_gesture_curve.cc',
         'touch_fling_gesture_curve.h',
-        'webfallbackthemeengine_impl.cc',
-        'webfallbackthemeengine_impl.h',
         'webkit_child_export.h',
         'webkit_child_helpers.cc',
         'webkit_child_helpers.h',