diff options
Diffstat (limited to 'chrome/renderer')
17 files changed, 20 insertions, 20 deletions
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 926ccd3..ffb7765 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -19,7 +19,6 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/common/crash_keys.h" #include "chrome/common/extensions/chrome_extensions_client.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_process_policy.h" #include "chrome/common/extensions/extension_set.h" @@ -75,6 +74,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_urls.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc index 51f1a3c..a2fcbc1 100644 --- a/chrome/renderer/chrome_content_renderer_client_unittest.cc +++ b/chrome/renderer/chrome_content_renderer_client_unittest.cc @@ -7,9 +7,9 @@ #include <vector> #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" #include "chrome/renderer/searchbox/search_bouncer.h" #include "content/public/common/webplugininfo.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc index d180fcf..e2c7e32 100644 --- a/chrome/renderer/extensions/chrome_v8_context.cc +++ b/chrome/renderer/extensions/chrome_v8_context.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/features/base_feature_provider.h" #include "chrome/renderer/extensions/chrome_v8_extension.h" @@ -16,6 +15,7 @@ #include "chrome/renderer/extensions/user_script_slave.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_api.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" diff --git a/chrome/renderer/extensions/chrome_v8_context_set.cc b/chrome/renderer/extensions/chrome_v8_context_set.cc index 49c9397..40b6fe1d 100644 --- a/chrome/renderer/extensions/chrome_v8_context_set.cc +++ b/chrome/renderer/extensions/chrome_v8_context_set.cc @@ -8,12 +8,12 @@ #include "base/message_loop/message_loop.h" #include "base/tracked_objects.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc index 1470158..002b129 100644 --- a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc +++ b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/message_loop/message_loop.h" -#include "chrome/common/extensions/extension.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/chrome_v8_context_set.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebFrame.h" diff --git a/chrome/renderer/extensions/chrome_v8_extension.cc b/chrome/renderer/extensions/chrome_v8_extension.cc index 475a202..02d287f 100644 --- a/chrome/renderer/extensions/chrome_v8_extension.cc +++ b/chrome/renderer/extensions/chrome_v8_extension.cc @@ -8,11 +8,11 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/dispatcher.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_api.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index 943e97d..11f1f3b 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -18,13 +18,11 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/crash_keys.h" #include "chrome/common/extensions/api/messaging/message.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/manifest_handlers/externally_connectable.h" #include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h" #include "chrome/common/extensions/message_bundle.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/api_activity_logger.h" @@ -72,6 +70,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_api.h" #include "extensions/common/extension_urls.h" #include "extensions/common/features/feature.h" @@ -80,6 +79,7 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/view_type.h" #include "grit/common_resources.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 341d93e..2fe4a24 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -14,7 +14,6 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/value_counter.h" @@ -29,6 +28,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" #include "extensions/common/event_filter.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/view_type.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/extensions/page_actions_custom_bindings.cc b/chrome/renderer/extensions/page_actions_custom_bindings.cc index 3c93154..31140e4 100644 --- a/chrome/renderer/extensions/page_actions_custom_bindings.cc +++ b/chrome/renderer/extensions/page_actions_custom_bindings.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/renderer/extensions/dispatcher.h" +#include "extensions/common/extension.h" #include "grit/renderer_resources.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h index ace06c9..5638c34 100644 --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_EXTENSIONS_RENDERER_PERMISSIONS_POLICY_DELEGATE_H_ #define CHROME_RENDERER_EXTENSIONS_RENDERER_PERMISSIONS_POLICY_DELEGATE_H_ -#include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc index 653a5a5..18c028c 100644 --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc @@ -4,15 +4,15 @@ #include "base/command_line.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/renderer/extensions/dispatcher.h" #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/mock_render_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" +#include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc index 34bc7f3..ad47414 100644 --- a/chrome/renderer/extensions/resource_request_policy.cc +++ b/chrome/renderer/extensions/resource_request_policy.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" @@ -16,6 +15,7 @@ #include "chrome/common/url_constants.h" #include "content/public/common/page_transition_types.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/web/WebConsoleMessage.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/runtime_custom_bindings.cc b/chrome/renderer/extensions/runtime_custom_bindings.cc index fba7355..5a0915e 100644 --- a/chrome/renderer/extensions/runtime_custom_bindings.cc +++ b/chrome/renderer/extensions/runtime_custom_bindings.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/renderer/extensions/api_activity_logger.h" #include "chrome/renderer/extensions/chrome_v8_context.h" @@ -15,6 +14,7 @@ #include "chrome/renderer/extensions/extension_helper.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" #include "extensions/common/manifest.h" diff --git a/chrome/renderer/extensions/user_script_scheduler.cc b/chrome/renderer/extensions/user_script_scheduler.cc index 4966c44a..0b20bcf 100644 --- a/chrome/renderer/extensions/user_script_scheduler.cc +++ b/chrome/renderer/extensions/user_script_scheduler.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/dispatcher.h" @@ -20,6 +19,7 @@ #include "content/public/renderer/v8_value_converter.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permissions_data.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 526a510..4b7b9e9 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -14,10 +14,8 @@ #include "base/strings/stringprintf.h" #include "base/timer/elapsed_timer.h" #include "chrome/common/extensions/csp_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/dom_activity_logger.h" @@ -25,6 +23,8 @@ #include "chrome/renderer/isolated_world_ids.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebVector.h" diff --git a/chrome/renderer/extensions/webstore_bindings.cc b/chrome/renderer/extensions/webstore_bindings.cc index 6237a24..659baef 100644 --- a/chrome/renderer/extensions/webstore_bindings.cc +++ b/chrome/renderer/extensions/webstore_bindings.cc @@ -5,11 +5,11 @@ #include "chrome/renderer/extensions/webstore_bindings.h" #include "base/strings/string_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebElement.h" diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index bab657d..acc5401 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -11,13 +11,13 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/autocomplete_match_type.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/instant_types.h" #include "chrome/common/ntp_logging_events.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/searchbox/searchbox.h" #include "content/public/common/url_constants.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebDocument.h" |