diff options
43 files changed, 38 insertions, 47 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 8e6b563..cfdeb46 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -32,9 +32,9 @@ #include "content/app/content_main.h" #include "content/app/content_main_delegate.h" #include "content/browser/renderer_host/render_process_host.h" -#include "content/common/content_client.h" #include "content/common/content_counters.h" #include "content/common/content_paths.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "media/base/media.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 225fc5a..3484c26 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -93,8 +93,8 @@ #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/common/child_process.h" -#include "content/common/content_client.h" #include "content/common/main_function_params.h" +#include "content/public/common/content_client.h" #include "grit/app_locale_settings.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index bbaf432..2b8adf6 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -46,7 +46,6 @@ #include "content/browser/tab_contents/popup_menu_helper_mac.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" -#include "content/common/content_client.h" #include "content/common/notification_service.h" #include "content/common/view_messages.h" #include "content/public/browser/native_web_keyboard_event.h" diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index dedb05e..4c7a6a2 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -33,8 +33,8 @@ #include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h" -#include "content/common/content_client.h" #include "content/common/net/url_fetcher.h" +#include "content/public/common/content_client.h" #include "net/base/cert_verifier.h" #include "net/base/cookie_monster.h" #include "net/base/default_origin_bound_cert_store.h" diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc index b833abd..5124580 100644 --- a/chrome/browser/net/chrome_url_request_context.cc +++ b/chrome/browser/net/chrome_url_request_context.cc @@ -16,8 +16,8 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/browser/browser_thread.h" -#include "content/common/content_client.h" #include "content/common/notification_service.h" +#include "content/public/common/content_client.h" #include "net/base/cookie_store.h" #include "net/http/http_util.h" diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc index 8c886fe..7d07b9d 100644 --- a/chrome/browser/policy/device_management_service.cc +++ b/chrome/browser/policy/device_management_service.cc @@ -12,7 +12,7 @@ #include "chrome/browser/policy/device_management_backend.h" #include "chrome/browser/policy/device_management_backend_impl.h" #include "content/browser/browser_thread.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" #include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc index b0245ac..e254e16 100644 --- a/chrome/browser/sync/glue/http_bridge.cc +++ b/chrome/browser/sync/glue/http_bridge.cc @@ -8,7 +8,7 @@ #include "base/message_loop_proxy.h" #include "base/string_number_conversions.h" #include "content/browser/browser_thread.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" #include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index 0534770..dfc8607 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -33,8 +33,8 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "content/browser/browser_thread.h" -#include "content/common/content_client.h" #include "content/common/notification_service.h" +#include "content/public/common/content_client.h" static const int kSaveChangesIntervalSeconds = 10; static const FilePath::CharType kSyncDataFolderName[] = diff --git a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc index f4d9b61..5b43ebc 100644 --- a/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/about_page_handler.cc @@ -25,7 +25,7 @@ #include "chrome/browser/google/google_util.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h index 5f069f3..a1b3bd9 100644 --- a/chrome/common/chrome_content_client.h +++ b/chrome/common/chrome_content_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" namespace chrome { diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 04b39ba..cb67909 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -48,9 +48,9 @@ #include "chrome_frame/utils.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_process_host.h" -#include "content/common/content_client.h" #include "content/common/content_paths.h" #include "content/common/notification_service.h" +#include "content/public/common/content_client.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm index ad5db97..162d0f8 100644 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm @@ -12,7 +12,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility_manager.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" #include "grit/webkit_strings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index f73ff56..7dded8c 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -10,7 +10,6 @@ #include "content/browser/content_browser_client.h" #include "content/browser/site_instance.h" #include "content/browser/webui/web_ui_factory.h" -#include "content/common/content_client.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" diff --git a/content/browser/content_browser_client.h b/content/browser/content_browser_client.h index 6715ef8..3508374 100644 --- a/content/browser/content_browser_client.h +++ b/content/browser/content_browser_client.h @@ -9,8 +9,8 @@ #include <string> #include "base/callback.h" -#include "content/common/content_client.h" #include "content/common/window_container_type.h" +#include "content/public/common/content_client.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" class AccessTokenStore; diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc index 00c6844..fc6bea5 100644 --- a/content/browser/debugger/devtools_manager.cc +++ b/content/browser/debugger/devtools_manager.cc @@ -16,7 +16,6 @@ #include "content/browser/debugger/render_view_devtools_agent_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/content_client.h" #include "googleurl/src/gurl.h" // static diff --git a/content/browser/geolocation/arbitrator_dependency_factory.cc b/content/browser/geolocation/arbitrator_dependency_factory.cc index a2f2790..2506d20 100644 --- a/content/browser/geolocation/arbitrator_dependency_factory.cc +++ b/content/browser/geolocation/arbitrator_dependency_factory.cc @@ -7,7 +7,6 @@ #include "content/browser/content_browser_client.h" #include "content/browser/geolocation/access_token_store.h" #include "content/browser/geolocation/location_provider.h" -#include "content/common/content_client.h" // GeolocationArbitratorDependencyFactory GeolocationArbitratorDependencyFactory:: diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc index 91e8a11..f9b8e3d 100644 --- a/content/browser/gpu/gpu_data_manager.cc +++ b/content/browser/gpu/gpu_data_manager.cc @@ -18,9 +18,9 @@ #include "content/browser/browser_thread.h" #include "content/browser/gpu/gpu_blacklist.h" #include "content/browser/gpu/gpu_process_host.h" -#include "content/common/content_client.h" #include "content/common/gpu/gpu_messages.h" #include "content/gpu/gpu_info_collector.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_switches.h" diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc index 5329e1b..bf4d98a 100644 --- a/content/browser/renderer_host/render_process_host.cc +++ b/content/browser/renderer_host/render_process_host.cc @@ -13,7 +13,6 @@ #include "content/browser/content_browser_client.h" #include "content/browser/webui/web_ui_factory.h" #include "content/common/child_process_info.h" -#include "content/common/content_client.h" #include "content/common/content_constants.h" #include "content/common/notification_service.h" #include "content/public/browser/notification_types.h" diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc index 639619c..aa6689e 100644 --- a/content/browser/renderer_host/test_render_view_host.cc +++ b/content/browser/renderer_host/test_render_view_host.cc @@ -9,9 +9,9 @@ #include "content/browser/site_instance.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/test_tab_contents.h" -#include "content/common/content_client.h" #include "content/common/dom_storage_common.h" #include "content/common/view_messages.h" +#include "content/public/common/content_client.h" #include "content/test/test_browser_context.h" #include "ui/gfx/rect.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/browser/site_instance.cc b/content/browser/site_instance.cc index 97bb121..10d6351 100644 --- a/content/browser/site_instance.cc +++ b/content/browser/site_instance.cc @@ -8,7 +8,6 @@ #include "content/browser/content_browser_client.h" #include "content/browser/renderer_host/browser_render_process_host.h" #include "content/browser/webui/web_ui_factory.h" -#include "content/common/content_client.h" #include "content/common/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/common/url_constants.h" diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc index f2c0e19..50cc712 100644 --- a/content/browser/site_instance_unittest.cc +++ b/content/browser/site_instance_unittest.cc @@ -16,8 +16,8 @@ #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/empty_web_ui_factory.h" -#include "content/common/content_client.h" #include "content/common/content_constants.h" +#include "content/public/common/content_client.h" #include "content/public/common/url_constants.h" #include "content/test/test_browser_context.h" #include "googleurl/src/url_util.h" diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc index 8799c0b..cf437c3 100644 --- a/content/browser/tab_contents/render_view_host_manager.cc +++ b/content/browser/tab_contents/render_view_host_manager.cc @@ -17,7 +17,6 @@ #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/webui/web_ui.h" #include "content/browser/webui/web_ui_factory.h" -#include "content/common/content_client.h" #include "content/common/notification_service.h" #include "content/common/view_messages.h" #include "content/public/browser/notification_types.h" diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 6e70c65..98dc8b9 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -39,7 +39,6 @@ #include "content/browser/tab_contents/title_updated_details.h" #include "content/browser/user_metrics.h" #include "content/browser/webui/web_ui_factory.h" -#include "content/common/content_client.h" #include "content/common/content_constants.h" #include "content/common/content_restriction.h" #include "content/common/intents_messages.h" diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index 518a267..4f4fba2 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -13,10 +13,10 @@ #include "base/process_util.h" #include "base/string_util.h" #include "content/common/child_process.h" -#include "content/common/content_client.h" #include "content/common/gpu/gpu_channel_manager.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/gpu/transport_texture.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_surface.h" diff --git a/content/common/npobject_stub.cc b/content/common/npobject_stub.cc index 4db6a28..7e283ce9 100644 --- a/content/common/npobject_stub.cc +++ b/content/common/npobject_stub.cc @@ -5,10 +5,10 @@ #include "content/common/npobject_stub.h" #include "base/command_line.h" -#include "content/common/content_client.h" #include "content/common/np_channel_base.h" #include "content/common/npobject_util.h" #include "content/common/plugin_messages.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc index fd706ea..12bb416 100644 --- a/content/common/pepper_plugin_registry.cc +++ b/content/common/pepper_plugin_registry.cc @@ -10,7 +10,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index c919002..2057bcb 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -16,9 +16,9 @@ #include "base/stringprintf.h" #include "base/string_util.h" #include "base/win/windows_version.h" -#include "content/common/content_client.h" #include "content/common/child_process_info.h" #include "content/common/debug_flags.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "sandbox/src/sandbox.h" #include "ui/gfx/gl/gl_switches.h" diff --git a/content/common/swapped_out_messages.cc b/content/common/swapped_out_messages.cc index 097ccce..3189d19 100644 --- a/content/common/swapped_out_messages.cc +++ b/content/common/swapped_out_messages.cc @@ -4,8 +4,8 @@ #include "content/common/swapped_out_messages.h" -#include "content/common/content_client.h" #include "content/common/view_messages.h" +#include "content/public/common/content_client.h" namespace content { diff --git a/content/content_common.gypi b/content/content_common.gypi index 0c41c2a..0b1719d 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -68,8 +68,6 @@ 'common/content_message_generator.cc', 'common/content_message_generator.h', 'common/content_export.h', - 'common/content_client.cc', - 'common/content_client.h', 'common/content_constants.cc', 'common/content_constants.h', 'common/content_counters.cc', @@ -257,6 +255,8 @@ 'common/window_container_type.cc', 'common/window_container_type.h', 'common/worker_messages.h', + 'public/common/content_client.cc', + 'public/common/content_client.h', ], 'conditions': [ ['OS!="win"', { diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index f21db0e..5288984 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -12,8 +12,8 @@ #include "base/win/scoped_com_initializer.h" #include "build/build_config.h" #include "content/common/child_process.h" -#include "content/common/content_client.h" #include "content/common/gpu/gpu_messages.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc index acf6b53..1f98e50 100644 --- a/content/plugin/webplugin_delegate_stub.cc +++ b/content/plugin/webplugin_delegate_stub.cc @@ -8,13 +8,13 @@ #include "base/command_line.h" #include "base/string_number_conversions.h" -#include "content/common/content_client.h" #include "content/common/content_constants.h" #include "content/common/npobject_stub.h" #include "content/common/plugin_messages.h" #include "content/plugin/plugin_channel.h" #include "content/plugin/plugin_thread.h" #include "content/plugin/webplugin_proxy.h" +#include "content/public/common/content_client.h" #include "content/public/common/content_switches.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 42dd084..757e41e 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -10,12 +10,12 @@ #include "base/memory/scoped_handle.h" #include "base/shared_memory.h" #include "build/build_config.h" -#include "content/common/content_client.h" #include "content/common/npobject_proxy.h" #include "content/common/npobject_util.h" #include "content/common/plugin_messages.h" #include "content/plugin/plugin_channel.h" #include "content/plugin/plugin_thread.h" +#include "content/public/common/content_client.h" #include "content/public/common/url_constants.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_device.h" diff --git a/content/common/content_client.cc b/content/public/common/content_client.cc index ed46636..9d4f8b6 100644 --- a/content/common/content_client.cc +++ b/content/public/common/content_client.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" #include "base/logging.h" #include "base/string_piece.h" diff --git a/content/common/content_client.h b/content/public/common/content_client.h index 154646b..16bec63 100644 --- a/content/common/content_client.h +++ b/content/public/common/content_client.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_COMMON_CONTENT_CLIENT_H_ -#define CONTENT_COMMON_CONTENT_CLIENT_H_ +#ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ +#define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ #pragma once #include <string> @@ -116,4 +116,4 @@ class CONTENT_EXPORT ContentClient { } // namespace content -#endif // CONTENT_COMMON_CONTENT_CLIENT_H_ +#endif // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_ diff --git a/content/public/plugin/content_plugin_client.h b/content/public/plugin/content_plugin_client.h index 346765a..0d5016d 100644 --- a/content/public/plugin/content_plugin_client.h +++ b/content/public/plugin/content_plugin_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/string16.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" namespace content { diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 362525c..ca599cf 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -10,7 +10,7 @@ #include "base/string16.h" #include "ipc/ipc_message.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h" class FilePath; diff --git a/content/public/utility/content_utility_client.h b/content/public/utility/content_utility_client.h index 6ed09b4..689aa0c 100644 --- a/content/public/utility/content_utility_client.h +++ b/content/public/utility/content_utility_client.h @@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_UTILITY_CONTENT_UTILITY_CLIENT_H_ #pragma once -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" namespace content { diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc index fb0fbfe..8f339f1 100644 --- a/content/renderer/renderer_glue.cc +++ b/content/renderer/renderer_glue.cc @@ -17,7 +17,6 @@ #include "base/shared_memory.h" #include "base/string_util.h" #include "content/common/clipboard_messages.h" -#include "content/common/content_client.h" #include "content/common/npobject_util.h" #include "content/common/socket_stream_dispatcher.h" #include "content/common/view_messages.h" diff --git a/content/renderer/webworker_proxy.cc b/content/renderer/webworker_proxy.cc index 2b6ce73..54fc72f 100644 --- a/content/renderer/webworker_proxy.cc +++ b/content/renderer/webworker_proxy.cc @@ -1,14 +1,14 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "content/renderer/webworker_proxy.h" #include "content/common/child_thread.h" -#include "content/common/content_client.h" #include "content/common/view_messages.h" #include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" +#include "content/public/common/content_client.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h" diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h index d0644d4..767241e 100644 --- a/content/shell/shell_content_client.h +++ b/content/shell/shell_content_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" namespace content { diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index 0f0ea29..f089ea5 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -7,9 +7,9 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "content/browser/mock_content_browser_client.h" -#include "content/common/content_client.h" #include "content/common/content_paths.h" #include "content/common/notification_service.h" +#include "content/public/common/content_client.h" #include "content/test/test_content_client.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/ui_base_paths.h" diff --git a/content/test/test_content_client.h b/content/test/test_content_client.h index c7bafa2..9244fe4 100644 --- a/content/test/test_content_client.h +++ b/content/test/test_content_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "content/common/content_client.h" +#include "content/public/common/content_client.h" class TestContentClient : public content::ContentClient { public: diff --git a/content/worker/webworker_stub.cc b/content/worker/webworker_stub.cc index b2dd6ae..8097070 100644 --- a/content/worker/webworker_stub.cc +++ b/content/worker/webworker_stub.cc @@ -6,10 +6,10 @@ #include "base/command_line.h" #include "content/common/child_thread.h" -#include "content/common/content_client.h" #include "content/common/file_system/file_system_dispatcher.h" #include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" +#include "content/public/common/content_client.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h" |