diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 18:48:54 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 18:48:54 +0000 |
| commit | 4657692aa85b7e16f4f05c508006c90b5eb9b4ed (patch) | |
| tree | 2769a68d86fdf7388727c6e4323c33c788e19da4 /content | |
| parent | c51f6c02627262dbdedac8623d9d2882a77454ce (diff) | |
| download | chromium_src-4657692aa85b7e16f4f05c508006c90b5eb9b4ed.zip chromium_src-4657692aa85b7e16f4f05c508006c90b5eb9b4ed.tar.gz chromium_src-4657692aa85b7e16f4f05c508006c90b5eb9b4ed.tar.bz2 | |
move webkit/glue/cpp_* -> webkit/renderer/
TBR=jamesr@chromium.org
BUG=239107
Review URL: https://codereview.chromium.org/15961005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_renderer.gypi | 1 | ||||
| -rw-r--r-- | content/content_tests.gypi | 8 | ||||
| -rw-r--r-- | content/renderer/cpp_bound_class_unittest.cc | 2 | ||||
| -rw-r--r-- | content/renderer/dom_automation_controller.h | 2 | ||||
| -rw-r--r-- | content/renderer/stats_collection_controller.h | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 8d8b1c1..a5a9f76 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -21,6 +21,7 @@ '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue_common', + '../webkit/support/webkit_support.gyp:glue_renderer', '../webkit/support/webkit_support.gyp:plugins', '../webkit/support/webkit_support.gyp:plugins_common', '../webkit/support/webkit_support.gyp:webkit_media', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 74d2549..925041c2 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -478,7 +478,6 @@ '../webkit/dom_storage/dom_storage_database_unittest.cc', '../webkit/dom_storage/dom_storage_map_unittest.cc', '../webkit/dom_storage/session_storage_database_unittest.cc', - '../webkit/glue/cpp_variant_unittest.cc', '../webkit/glue/glue_serialize_unittest.cc', '../webkit/glue/multipart_response_delegate_unittest.cc', '../webkit/glue/resource_request_body_unittest.cc', @@ -520,6 +519,7 @@ '../webkit/browser/quota/quota_manager_unittest.cc', '../webkit/browser/quota/quota_temporary_storage_evictor_unittest.cc', '../webkit/browser/quota/usage_tracker_unittest.cc', + '../webkit/renderer/cpp_variant_unittest.cc', '../webkit/renderer/fileapi/webfilewriter_base_unittest.cc', ], 'conditions': [ @@ -556,6 +556,7 @@ '../v8/tools/gyp/v8.gyp:v8', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue_common', + '../webkit/support/webkit_support.gyp:glue_renderer', '../webkit/support/webkit_support.gyp:plugins', '../webkit/support/webkit_support.gyp:plugins_common', '../webkit/support/webkit_support.gyp:webkit_base', @@ -721,6 +722,7 @@ '../ui/ui.gyp:ui', '../webkit/support/webkit_support.gyp:clearkeycdmadapter', '../webkit/support/webkit_support.gyp:glue', + '../webkit/support/webkit_support.gyp:glue_renderer', ], 'include_dirs': [ '..', @@ -822,12 +824,12 @@ 'test/layout_browsertest.h', 'test/layout_test_http_server.cc', 'test/layout_test_http_server.h', - '../webkit/glue/cpp_binding_example.cc', - '../webkit/glue/cpp_binding_example.h', '../webkit/plugins/ppapi/mock_platform_image_2d.cc', '../webkit/plugins/ppapi/mock_platform_image_2d.h', '../webkit/plugins/ppapi/mock_plugin_delegate.cc', '../webkit/plugins/ppapi/mock_plugin_delegate.h', + '../webkit/renderer/cpp_binding_example.cc', + '../webkit/renderer/cpp_binding_example.h', ], 'conditions': [ ['chromeos==0', { diff --git a/content/renderer/cpp_bound_class_unittest.cc b/content/renderer/cpp_bound_class_unittest.cc index 240f7f4..62d4a29 100644 --- a/content/renderer/cpp_bound_class_unittest.cc +++ b/content/renderer/cpp_bound_class_unittest.cc @@ -12,7 +12,7 @@ #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" -#include "webkit/glue/cpp_binding_example.h" +#include "webkit/renderer/cpp_binding_example.h" using webkit_glue::CppArgumentList; using webkit_glue::CppBindingExample; diff --git a/content/renderer/dom_automation_controller.h b/content/renderer/dom_automation_controller.h index 1516eea..0f6a74a 100644 --- a/content/renderer/dom_automation_controller.h +++ b/content/renderer/dom_automation_controller.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_DOM_AUTOMATION_CONTROLLER_H_ #include "ipc/ipc_sender.h" -#include "webkit/glue/cpp_bound_class.h" +#include "webkit/renderer/cpp_bound_class.h" /* DomAutomationController class: Bound to Javascript window.domAutomationController object. diff --git a/content/renderer/stats_collection_controller.h b/content/renderer/stats_collection_controller.h index eb1ccb0..63175d8 100644 --- a/content/renderer/stats_collection_controller.h +++ b/content/renderer/stats_collection_controller.h @@ -6,7 +6,7 @@ #define CONTENT_RENDERER_STATS_COLLECTION_CONTROLLER_H_ #include "ipc/ipc_sender.h" -#include "webkit/glue/cpp_bound_class.h" +#include "webkit/renderer/cpp_bound_class.h" namespace content { |