diff options
45 files changed, 48 insertions, 48 deletions
diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index 0a5abfa..6dce729 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -37,7 +37,7 @@ #include "content/browser/browser_thread.h" #include "content/common/content_notification_types.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" #include "third_party/libevent/evdns.h" #include "third_party/libevent/event.h" diff --git a/chrome/browser/chromeos/web_socket_proxy_controller.cc b/chrome/browser/chromeos/web_socket_proxy_controller.cc index 7f2c9141..c7ccfbf 100644 --- a/chrome/browser/chromeos/web_socket_proxy_controller.cc +++ b/chrome/browser/chromeos/web_socket_proxy_controller.cc @@ -25,7 +25,7 @@ #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/extensions/apps_promo.cc b/chrome/browser/extensions/apps_promo.cc index 390b575..5f8f734 100644 --- a/chrome/browser/extensions/apps_promo.cc +++ b/chrome/browser/extensions/apps_promo.cc @@ -15,8 +15,8 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/common/url_constants.h" #include "content/common/notification_service.h" +#include "content/public/common/url_constants.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/extensions/extension_content_settings_helpers.cc b/chrome/browser/extensions/extension_content_settings_helpers.cc index df82f4a..5809832 100644 --- a/chrome/browser/extensions/extension_content_settings_helpers.cc +++ b/chrome/browser/extensions/extension_content_settings_helpers.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/url_pattern.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" namespace { diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index acbfab2..d979a22 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -17,7 +17,7 @@ #include "chrome/browser/ssl/ssl_error_info.h" #include "content/browser/cert_store.h" #include "content/browser/ssl/ssl_manager.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index b5a0d9e..d13f82c 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -37,7 +37,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "grit/generated_resources.h" #include "net/base/mock_host_resolver.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_tab_controller_unittest.cc index dfac3dc..284b57a 100644 --- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc +++ b/chrome/browser/printing/print_preview_tab_controller_unittest.cc @@ -13,7 +13,7 @@ #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" typedef BrowserWithTestWindowTest PrintPreviewTabControllerUnitTest; diff --git a/chrome/browser/tab_contents/web_drag_dest_gtk.cc b/chrome/browser/tab_contents/web_drag_dest_gtk.cc index d46d43a..c3af69a 100644 --- a/chrome/browser/tab_contents/web_drag_dest_gtk.cc +++ b/chrome/browser/tab_contents/web_drag_dest_gtk.cc @@ -13,7 +13,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/drag_utils_gtk.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/gtk/gtk_screen_utils.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 3139190..4401f0e 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -40,8 +40,8 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_source.h" -#include "content/common/url_constants.h" #include "content/public/common/page_transition_types.h" +#include "content/public/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/ui/cocoa/drag_util.mm b/chrome/browser/ui/cocoa/drag_util.mm index 2d3b4b2..a8d9430 100644 --- a/chrome/browser/ui/cocoa/drag_util.mm +++ b/chrome/browser/ui/cocoa/drag_util.mm @@ -9,7 +9,7 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "content/browser/plugin_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm index dd99146..3e8cfc4 100644 --- a/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm +++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_source.mm @@ -23,7 +23,7 @@ #include "content/browser/download/drag_download_util.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/file_stream.h" #include "net/base/net_util.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view.h b/chrome/browser/ui/omnibox/omnibox_view.h index 1d2253b4..dd5d792 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.h +++ b/chrome/browser/ui/omnibox/omnibox_view.h @@ -18,7 +18,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "ui/gfx/native_widget_types.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc index f6f2b1f..c34bd43 100644 --- a/chrome/browser/ui/panels/base_panel_browser_test.cc +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/test_tab_contents.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #if defined(OS_MACOSX) #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h" diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 20dd241..f2cb6f6 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -25,7 +25,7 @@ #include "content/browser/download/download_manager.h" #include "content/browser/net/url_request_mock_http_job.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "testing/gtest/include/gtest/gtest.h" class PanelBrowserTest : public BasePanelBrowserTest { diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc index 741245c..349c3dc 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" class ToolbarModelTest : public BrowserWithTestWindowTest { public: diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc index e541908..6ce7ef9a 100644 --- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc @@ -22,7 +22,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/common/extensions/extension_permission_set.cc b/chrome/common/extensions/extension_permission_set.cc index fde28ee..fd74af3 100644 --- a/chrome/common/extensions/extension_permission_set.cc +++ b/chrome/common/extensions/extension_permission_set.cc @@ -16,7 +16,7 @@ #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/extensions/url_pattern_set.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "grit/generated_resources.h" #include "net/base/registry_controlled_domain.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h index 73d4b48..a3c6a5d 100644 --- a/chrome/common/url_constants.h +++ b/chrome/common/url_constants.h @@ -9,7 +9,7 @@ #pragma once #include "build/build_config.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" namespace chrome { diff --git a/chrome/renderer/about_handler.cc b/chrome/renderer/about_handler.cc index c8e1604..1b21e76 100644 --- a/chrome/renderer/about_handler.cc +++ b/chrome/renderer/about_handler.cc @@ -8,7 +8,7 @@ #include "base/process_util.h" #include "base/threading/platform_thread.h" #include "chrome/common/about_handler.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" typedef void (*AboutHandlerFuncPtr)(); diff --git a/content/browser/browser_url_handler.cc b/content/browser/browser_url_handler.cc index 65c176c8..d0ed4a2 100644 --- a/content/browser/browser_url_handler.cc +++ b/content/browser/browser_url_handler.cc @@ -7,7 +7,7 @@ #include "base/string_util.h" #include "content/browser/content_browser_client.h" #include "content/browser/webui/web_ui.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" // Handles rewriting view-source URLs for what we'll actually load. diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index 86c521a..f73ff56 100644 --- a/content/browser/browsing_instance.cc +++ b/content/browser/browsing_instance.cc @@ -11,8 +11,8 @@ #include "content/browser/site_instance.h" #include "content/browser/webui/web_ui_factory.h" #include "content/common/content_client.h" -#include "content/common/url_constants.h" #include "content/public/common/content_switches.h" +#include "content/public/common/url_constants.h" // static BrowsingInstance::ContextSiteInstanceMap diff --git a/content/browser/child_process_security_policy.cc b/content/browser/child_process_security_policy.cc index 0da4110..1433218 100644 --- a/content/browser/child_process_security_policy.cc +++ b/content/browser/child_process_security_policy.cc @@ -9,8 +9,8 @@ #include "base/platform_file.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "content/common/url_constants.h" #include "content/public/common/bindings_policy.h" +#include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request.h" diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index b1fc67b0..29c62d6 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc @@ -9,7 +9,7 @@ #include "base/platform_file.h" #include "content/browser/child_process_security_policy.h" #include "content/common/test_url_constants.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_test_job.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index d03d55b..2574232 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -33,8 +33,8 @@ #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" +#include "content/public/common/url_constants.h" #include "net/base/io_buffer.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" diff --git a/content/browser/net/url_request_mock_http_job.cc b/content/browser/net/url_request_mock_http_job.cc index 2691e2f..4b22301 100644 --- a/content/browser/net/url_request_mock_http_job.cc +++ b/content/browser/net/url_request_mock_http_job.cc @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/net_util.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_filter.h" diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index de00cf1..0f81b6d 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -31,9 +31,9 @@ #include "content/browser/user_metrics.h" #include "content/common/desktop_notification_messages.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" +#include "content/public/common/url_constants.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_platform_file.h" #include "media/audio/audio_util.h" diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index ff8d992..6a41de3 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -39,9 +39,9 @@ #include "content/common/result_codes.h" #include "content/common/speech_input_messages.h" #include "content/common/swapped_out_messages.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/public/common/bindings_policy.h" +#include "content/public/common/url_constants.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context_getter.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc index 019e22d..e8e74ca 100644 --- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -16,7 +16,7 @@ #include "content/common/notification_details.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/net_util.h" #include "net/test/test_server.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index 759273c..184a54a 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -54,9 +54,9 @@ #include "content/browser/worker_host/worker_service.h" #include "content/common/notification_service.h" #include "content/common/resource_messages.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" +#include "content/public/common/url_constants.h" #include "net/base/auth.h" #include "net/base/cert_status_flags.h" #include "net/base/cookie_monster.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc index 19bb298..3c0c418 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_uitest.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_uitest.cc @@ -18,7 +18,7 @@ #include "content/browser/net/url_request_failed_dns_job.h" #include "content/browser/net/url_request_mock_http_job.h" #include "content/common/test_url_constants.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/net_util.h" #include "net/test/test_server.h" diff --git a/content/browser/site_instance.cc b/content/browser/site_instance.cc index 44a9f2e..ddc3a99 100644 --- a/content/browser/site_instance.cc +++ b/content/browser/site_instance.cc @@ -10,7 +10,7 @@ #include "content/browser/webui/web_ui_factory.h" #include "content/common/content_client.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/registry_controlled_domain.h" static bool IsURLSameAsAnySiteInstance(const GURL& url) { diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc index 5c355dc..f2c0e19 100644 --- a/content/browser/site_instance_unittest.cc +++ b/content/browser/site_instance_unittest.cc @@ -18,7 +18,7 @@ #include "content/browser/webui/empty_web_ui_factory.h" #include "content/common/content_client.h" #include "content/common/content_constants.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "content/test/test_browser_context.h" #include "googleurl/src/url_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc index 8f28f4b..4709434 100644 --- a/content/browser/ssl/ssl_policy.cc +++ b/content/browser/ssl/ssl_policy.cc @@ -18,7 +18,7 @@ #include "content/browser/ssl/ssl_request_info.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/cert_status_flags.h" #include "net/base/ssl_info.h" #include "webkit/glue/resource_type.h" diff --git a/content/browser/tab_contents/navigation_entry.cc b/content/browser/tab_contents/navigation_entry.cc index 22f421c..843e95e 100644 --- a/content/browser/tab_contents/navigation_entry.cc +++ b/content/browser/tab_contents/navigation_entry.cc @@ -9,7 +9,7 @@ #include "content/browser/content_browser_client.h" #include "content/browser/site_instance.h" #include "content/common/content_constants.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/base/net_util.h" #include "ui/base/text/text_elider.h" diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc index 044c742..652685e 100644 --- a/content/browser/tab_contents/render_view_host_manager.cc +++ b/content/browser/tab_contents/render_view_host_manager.cc @@ -20,9 +20,9 @@ #include "content/common/content_client.h" #include "content/common/notification_service.h" #include "content/common/content_notification_types.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" +#include "content/public/common/url_constants.h" namespace base { class WaitableEvent; diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 97cff18..3f1a786 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -45,9 +45,9 @@ #include "content/common/intents_messages.h" #include "content/common/navigation_types.h" #include "content/common/notification_service.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/public/common/bindings_policy.h" +#include "content/public/common/url_constants.h" #include "content/public/common/view_types.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context_getter.h" diff --git a/content/browser/tab_contents/tab_contents_delegate.cc b/content/browser/tab_contents/tab_contents_delegate.cc index 293e7bb..a9849e2 100644 --- a/content/browser/tab_contents/tab_contents_delegate.cc +++ b/content/browser/tab_contents/tab_contents_delegate.cc @@ -9,7 +9,7 @@ #include "base/memory/singleton.h" #include "content/browser/javascript_dialogs.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "ui/gfx/rect.h" #include "webkit/glue/web_intent_data.h" diff --git a/content/common/test_url_constants.h b/content/common/test_url_constants.h index 4c81bb0..565d3fe 100644 --- a/content/common/test_url_constants.h +++ b/content/common/test_url_constants.h @@ -8,7 +8,7 @@ #define CONTENT_COMMON_TEST_URL_CONSTANTS_H_ #pragma once -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" namespace chrome { diff --git a/content/content_common.gypi b/content/content_common.gypi index a298a56..0889810 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -34,6 +34,8 @@ 'public/common/page_transition_types.cc', 'public/common/page_transition_types.h', 'public/common/resource_dispatcher_delegate.h', + 'public/common/url_constants.cc', + 'public/common/url_constants.h', 'public/common/view_types.h', 'common/appcache/appcache_backend_proxy.cc', 'common/appcache/appcache_backend_proxy.h', @@ -245,8 +247,6 @@ 'common/text_input_client_messages.h', 'common/unix_domain_socket_posix.cc', 'common/unix_domain_socket_posix.h', - 'common/url_constants.cc', - 'common/url_constants.h', 'common/utility_messages.h', 'common/view_messages.h', 'common/view_message_enums.h', diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 643d445..42dd084 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -14,9 +14,9 @@ #include "content/common/npobject_proxy.h" #include "content/common/npobject_util.h" #include "content/common/plugin_messages.h" -#include "content/common/url_constants.h" #include "content/plugin/plugin_channel.h" #include "content/plugin/plugin_thread.h" +#include "content/public/common/url_constants.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/platform_device.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" diff --git a/content/common/url_constants.cc b/content/public/common/url_constants.cc index 442b52d..2c046d4 100644 --- a/content/common/url_constants.cc +++ b/content/public/common/url_constants.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/url_constants.h" +#include "content/public/common/url_constants.h" #include "base/string_util.h" #include "googleurl/src/url_util.h" diff --git a/content/common/url_constants.h b/content/public/common/url_constants.h index f00460a..4b2362c 100644 --- a/content/common/url_constants.h +++ b/content/public/common/url_constants.h @@ -4,8 +4,8 @@ // Contains constants for known URLs and portions thereof. -#ifndef CONTENT_COMMON_URL_CONSTANTS_H_ -#define CONTENT_COMMON_URL_CONSTANTS_H_ +#ifndef CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_ +#define CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_ #pragma once #include "content/common/content_export.h" @@ -55,4 +55,4 @@ void CONTENT_EXPORT RegisterContentSchemes( } // namespace chrome -#endif // CONTENT_COMMON_URL_CONSTANTS_H_ +#endif // CONTENT_PUBLIC_COMMON_URL_CONSTANTS_H_ diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index db78988..9e65677 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -38,10 +38,10 @@ #include "content/common/quota_dispatcher.h" #include "content/common/renderer_preferences.h" #include "content/common/request_extra_data.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/content_switches.h" +#include "content/public/common/url_constants.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/navigation_state.h" #include "content/public/renderer/render_view_observer.h" diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc index 373aae6..52a6a26 100644 --- a/content/renderer/renderer_glue.cc +++ b/content/renderer/renderer_glue.cc @@ -20,9 +20,9 @@ #include "content/common/content_client.h" #include "content/common/npobject_util.h" #include "content/common/socket_stream_dispatcher.h" -#include "content/common/url_constants.h" #include "content/common/view_messages.h" #include "content/public/common/content_switches.h" +#include "content/public/common/url_constants.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/render_thread_impl.h" #include "googleurl/src/url_util.h" diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc index f24de11..355c287 100644 --- a/content/worker/test/worker_uitest.cc +++ b/content/worker/test/worker_uitest.cc @@ -14,7 +14,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/ui_layout_test.h" #include "content/browser/worker_host/worker_service.h" -#include "content/common/url_constants.h" +#include "content/public/common/url_constants.h" #include "net/test/test_server.h" namespace { |