diff options
102 files changed, 109 insertions, 109 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 52c0a93..8e6b563 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -35,7 +35,7 @@ #include "content/common/content_client.h" #include "content/common/content_counters.h" #include "content/common/content_paths.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "media/base/media.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_switches.h" diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 571e8f6..5adb0a5 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -20,7 +20,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/browser/user_metrics.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/gl/gl_switches.h" diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc index 4f94443..faeb325 100644 --- a/chrome/browser/content_settings/host_content_settings_map.cc +++ b/chrome/browser/content_settings/host_content_settings_map.cc @@ -28,9 +28,9 @@ #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" #include "content/browser/user_metrics.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/notification_source.h" +#include "content/public/common/content_switches.h" #include "googleurl/src/gurl.h" #include "net/base/net_errors.h" #include "net/base/static_cookie_policy.h" diff --git a/chrome/browser/mac/relauncher.cc b/chrome/browser/mac/relauncher.cc index 14abba2..e84e9f2 100644 --- a/chrome/browser/mac/relauncher.cc +++ b/chrome/browser/mac/relauncher.cc @@ -29,8 +29,8 @@ #include "chrome/browser/mac/install_from_dmg.h" #include "chrome/common/chrome_switches.h" #include "content/common/content_paths.h" -#include "content/common/content_switches.h" #include "content/common/main_function_params.h" +#include "content/public/common/content_switches.h" // RTLD_MAIN_ONLY is supported as of Mac OS X 10.5, but <dlfcn.h> does not // define it in the 10.5 SDK. It is present in the 10.6 SDK and is documented diff --git a/chrome/browser/magic_iframe_browsertest.cc b/chrome/browser/magic_iframe_browsertest.cc index 9efc283..aa1fef5 100644 --- a/chrome/browser/magic_iframe_browsertest.cc +++ b/chrome/browser/magic_iframe_browsertest.cc @@ -14,7 +14,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" class MagicIframeBrowserTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 9a6296b..e1b9c58f 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -148,10 +148,10 @@ #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/user_metrics.h" #include "content/common/content_restriction.h" -#include "content/common/content_switches.h" #include "content/common/notification_details.h" #include "content/common/notification_service.h" #include "content/common/page_zoom.h" +#include "content/public/common/content_switches.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 1f16e24..2279d18 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -81,8 +81,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/user_metrics.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" +#include "content/public/common/content_switches.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 5b158c7..30f79d6 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -29,9 +29,9 @@ #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/content_notification_types.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/notification_source.h" +#include "content/public/common/content_switches.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 9732c88..a809fee 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -25,7 +25,7 @@ 'app/hard_error_handler_win.h', 'app/scoped_ole_initializer.h', '../content/app/startup_helper_win.cc', - '../content/common/content_switches.cc', + '../content/public/common/content_switches.cc', ], 'mac_bundle_resources': [ 'app/app-Info.plist', @@ -510,11 +510,11 @@ 'app/hard_error_handler_win.cc', 'nacl/nacl_exe_win_64.cc', '../content/app/startup_helper_win.cc', - '../content/common/content_switches.cc', '../content/common/debug_flags.cc', # Needed for sandbox_policy.cc '../content/common/hi_res_timer_manager_win.cc', '../content/common/sandbox_policy.cc', '../content/common/sandbox_init_wrapper_win.cc', + '../content/public/common/content_switches.cc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/nacl64_exe_version.rc', ], 'dependencies': [ diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index d70a608..741baaf 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -11,7 +11,7 @@ #include "build/build_config.h" #include "base/base_switches.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" namespace switches { diff --git a/chrome/nacl/nacl_broker_listener.cc b/chrome/nacl/nacl_broker_listener.cc index 75864c8..32fc9ef 100644 --- a/chrome/nacl/nacl_broker_listener.cc +++ b/chrome/nacl/nacl_broker_listener.cc @@ -11,8 +11,8 @@ #include "base/process_util.h" #include "chrome/common/nacl_cmd_line.h" #include "chrome/common/nacl_messages.h" -#include "content/common/content_switches.h" #include "content/common/sandbox_policy.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_switches.h" NaClBrokerListener::NaClBrokerListener() diff --git a/chrome/renderer/benchmarking_extension.cc b/chrome/renderer/benchmarking_extension.cc index 348c97c..d6eb831 100644 --- a/chrome/renderer/benchmarking_extension.cc +++ b/chrome/renderer/benchmarking_extension.cc @@ -8,7 +8,7 @@ #include "base/metrics/stats_table.h" #include "base/time.h" #include "chrome/common/benchmarking_messages.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "content/public/renderer/render_thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/chrome_ppapi_interfaces.cc b/chrome/renderer/chrome_ppapi_interfaces.cc index 8fcdc71..9138cc8 100644 --- a/chrome/renderer/chrome_ppapi_interfaces.cc +++ b/chrome/renderer/chrome_ppapi_interfaces.cc @@ -10,7 +10,7 @@ #include "base/utf_string_conversions.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/chrome_ppb_pdf_impl.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "content/public/renderer/render_thread.h" #include "ppapi/c/private/ppb_nacl_private.h" #include "ppapi/c/private/ppb_pdf.h" diff --git a/chrome/test/gpu/webgl_conformance_tests.cc b/chrome/test/gpu/webgl_conformance_tests.cc index 2f4091c..8822151 100644 --- a/chrome/test/gpu/webgl_conformance_tests.cc +++ b/chrome/test/gpu/webgl_conformance_tests.cc @@ -11,7 +11,7 @@ #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/ui/javascript_test_util.h" #include "chrome/test/ui/ui_test.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "net/base/net_util.h" #include "ui/gfx/gl/gl_implementation.h" diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index e171702..8f4a12d 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -29,7 +29,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/npapi_test_helper.h" #include "content/browser/net/url_request_mock_http_job.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" using npapi_test::kTestCompleteCookie; using npapi_test::kTestCompleteSuccess; diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 0aa789a..a63256f 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -6,7 +6,7 @@ #include "base/path_service.h" #include "base/test/test_timeouts.h" #include "build/build_config.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index 39c3dd7..256fb9b 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -32,8 +32,8 @@ #include "base/win/iat_patch_function.h" #include "base/win/scoped_handle.h" #include "content/common/child_process_messages.h" -#include "content/common/content_switches.h" #include "content/common/sandbox_init_wrapper.h" +#include "content/public/common/content_switches.h" #include "printing/emf_win.h" #endif // defined(OS_WIN) diff --git a/content/app/content_main.cc b/content/app/content_main.cc index c59b16a..85d6144 100644 --- a/content/app/content_main.cc +++ b/content/app/content_main.cc @@ -20,10 +20,10 @@ #include "content/browser/browser_main.h" #include "content/common/content_constants.h" #include "content/common/content_paths.h" -#include "content/common/content_switches.h" #include "content/common/main_function_params.h" #include "content/common/sandbox_init_wrapper.h" #include "content/common/set_process_title.h" +#include "content/public/common/content_switches.h" #include "crypto/nss_util.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc index d3aaac7..41c6232 100644 --- a/content/browser/browser_child_process_host.cc +++ b/content/browser/browser_child_process_host.cc @@ -17,11 +17,11 @@ #include "content/browser/content_browser_client.h" #include "content/browser/renderer_host/resource_message_filter.h" #include "content/browser/trace_message_filter.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/plugin_messages.h" #include "content/common/process_watcher.h" #include "content/common/result_codes.h" +#include "content/public/common/content_switches.h" #if defined(OS_WIN) #include "base/synchronization/waitable_event.h" diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc index 1e9fb29..75e80c3 100644 --- a/content/browser/browser_main.cc +++ b/content/browser/browser_main.cc @@ -14,12 +14,12 @@ #include "base/threading/thread_restrictions.h" #include "content/browser/browser_thread.h" #include "content/browser/content_browser_client.h" -#include "content/common/content_switches.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "content/common/notification_service.h" #include "content/common/result_codes.h" #include "content/common/sandbox_policy.h" +#include "content/public/common/content_switches.h" #include "crypto/nss_util.h" #include "net/base/network_change_notifier.h" #include "net/base/ssl_config_service.h" diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc index ae603cf..86c521a 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/content_switches.h" #include "content/common/url_constants.h" +#include "content/public/common/content_switches.h" // static BrowsingInstance::ContextSiteInstanceMap diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 8e14048..5753112 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -15,9 +15,9 @@ #include "content/browser/browser_thread.h" #include "content/browser/content_browser_client.h" #include "content/common/chrome_descriptors.h" -#include "content/common/content_switches.h" #include "content/common/process_watcher.h" #include "content/common/result_codes.h" +#include "content/public/common/content_switches.h" #if defined(OS_WIN) #include "base/file_path.h" diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc index 1388b7f6..03a2c7f 100644 --- a/content/browser/device_orientation/device_orientation_browsertest.cc +++ b/content/browser/device_orientation/device_orientation_browsertest.cc @@ -11,7 +11,7 @@ #include "content/browser/device_orientation/orientation.h" #include "content/browser/device_orientation/provider.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" namespace device_orientation { diff --git a/content/browser/file_system/browser_file_system_helper.cc b/content/browser/file_system/browser_file_system_helper.cc index a468590..c28c537 100644 --- a/content/browser/file_system/browser_file_system_helper.cc +++ b/content/browser/file_system/browser_file_system_helper.cc @@ -6,8 +6,8 @@ #include "base/file_path.h" #include "base/command_line.h" -#include "content/common/content_switches.h" #include "content/browser/browser_thread.h" +#include "content/public/common/content_switches.h" #include "webkit/quota/quota_manager.h" scoped_refptr<fileapi::FileSystemContext> CreateFileSystemContext( diff --git a/content/browser/file_system/file_system_browsertest.cc b/content/browser/file_system/file_system_browsertest.cc index dfa9245..52a28b4 100644 --- a/content/browser/file_system/file_system_browsertest.cc +++ b/content/browser/file_system/file_system_browsertest.cc @@ -11,7 +11,7 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "webkit/quota/quota_manager.h" using quota::QuotaManager; diff --git a/content/browser/geolocation/core_location_provider_mac.mm b/content/browser/geolocation/core_location_provider_mac.mm index 2958872..826a42f 100644 --- a/content/browser/geolocation/core_location_provider_mac.mm +++ b/content/browser/geolocation/core_location_provider_mac.mm @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/command_line.h" #include "content/browser/geolocation/core_location_data_provider_mac.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" CoreLocationProviderMac::CoreLocationProviderMac() : is_updating_(false) { diff --git a/content/browser/geolocation/win7_location_api_win.cc b/content/browser/geolocation/win7_location_api_win.cc index 67de0d1..f66b6e2 100644 --- a/content/browser/geolocation/win7_location_api_win.cc +++ b/content/browser/geolocation/win7_location_api_win.cc @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "content/common/content_switches.h" #include "content/common/geoposition.h" +#include "content/public/common/content_switches.h" namespace { const double kKnotsToMetresPerSecondConversionFactor = 0.5144; diff --git a/content/browser/gpu/gpu_data_manager.cc b/content/browser/gpu/gpu_data_manager.cc index e11ce7d..e664ba1 100644 --- a/content/browser/gpu/gpu_data_manager.cc +++ b/content/browser/gpu/gpu_data_manager.cc @@ -19,9 +19,9 @@ #include "content/browser/gpu/gpu_blacklist.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/common/content_client.h" -#include "content/common/content_switches.h" #include "content/common/gpu/gpu_messages.h" #include "content/gpu/gpu_info_collector.h" +#include "content/public/common/content_switches.h" #include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_switches.h" #include "webkit/plugins/plugin_switches.h" diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index f82e336..58b41f7 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc @@ -18,11 +18,11 @@ #include "content/browser/gpu/gpu_process_host_ui_shim.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" -#include "content/common/content_switches.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/result_codes.h" #include "content/gpu/gpu_child_thread.h" #include "content/gpu/gpu_process.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_switches.h" #include "ui/gfx/gl/gl_context.h" diff --git a/content/browser/in_process_webkit/dom_storage_uitest.cc b/content/browser/in_process_webkit/dom_storage_uitest.cc index 1fd5864..230c4a8 100644 --- a/content/browser/in_process_webkit/dom_storage_uitest.cc +++ b/content/browser/in_process_webkit/dom_storage_uitest.cc @@ -8,7 +8,7 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/base/ui_test_utils.h" #include "chrome/test/ui/ui_layout_test.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "net/base/net_util.h" static const char* kRootFiles[] = { diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index 9390481..636973a 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc @@ -16,7 +16,7 @@ #include "content/browser/in_process_webkit/indexed_db_context.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "webkit/database/database_util.h" #include "webkit/quota/mock_special_storage_policy.h" #include "webkit/quota/quota_manager.h" diff --git a/content/browser/in_process_webkit/indexed_db_context.cc b/content/browser/in_process_webkit/indexed_db_context.cc index 9da8ca6..99b0330 100644 --- a/content/browser/in_process_webkit/indexed_db_context.cc +++ b/content/browser/in_process_webkit/indexed_db_context.cc @@ -14,7 +14,7 @@ #include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/indexed_db_quota_client.h" #include "content/browser/in_process_webkit/webkit_context.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBFactory.h" diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc index 902b151..990d3a3 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc @@ -12,9 +12,9 @@ #include "content/browser/in_process_webkit/indexed_db_transaction_callbacks.h" #include "content/browser/renderer_host/render_message_filter.h" #include "content/browser/user_metrics.h" -#include "content/common/content_switches.h" #include "content/common/indexed_db_messages.h" #include "content/common/result_codes.h" +#include "content/public/common/content_switches.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h" diff --git a/content/browser/in_process_webkit/webkit_thread.cc b/content/browser/in_process_webkit/webkit_thread.cc index 69ef13c..42f35be 100644 --- a/content/browser/in_process_webkit/webkit_thread.cc +++ b/content/browser/in_process_webkit/webkit_thread.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/browser/intents/intent_injector.cc b/content/browser/intents/intent_injector.cc index ceb2bc6..2295194 100644 --- a/content/browser/intents/intent_injector.cc +++ b/content/browser/intents/intent_injector.cc @@ -7,9 +7,9 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/string16.h" -#include "content/common/content_switches.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_message_macros.h" #include "webkit/glue/web_intent_data.h" #include "webkit/glue/web_intent_reply_data.h" diff --git a/content/browser/mach_broker_mac.cc b/content/browser/mach_broker_mac.cc index ad92a5a..115b910 100644 --- a/content/browser/mach_broker_mac.cc +++ b/content/browser/mach_broker_mac.cc @@ -15,8 +15,8 @@ #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/common/child_process_info.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" +#include "content/public/common/content_switches.h" namespace { // Prints a string representation of a Mach error code. diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 7b48aea..05628f6 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -25,9 +25,9 @@ #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_message_filter.h" -#include "content/common/content_switches.h" #include "content/common/plugin_messages.h" #include "content/common/resource_messages.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" #include "ui/gfx/native_widget_types.h" diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index 97a90c4..ba05a15 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -25,12 +25,12 @@ #include "content/browser/resource_context.h" #include "content/browser/utility_process_host.h" #include "content/common/content_notification_types.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/pepper_plugin_registry.h" #include "content/common/plugin_messages.h" #include "content/common/utility_messages.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "webkit/plugins/npapi/plugin_constants_win.h" #include "webkit/plugins/npapi/plugin_group.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/content/browser/plugin_service_browsertest.cc b/content/browser/plugin_service_browsertest.cc index 6228a9c..55db351 100644 --- a/content/browser/plugin_service_browsertest.cc +++ b/content/browser/plugin_service_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/browser/browser_thread.h" #include "content/browser/resource_context.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "testing/gmock/include/gmock/gmock.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index 7dfe4ee..34c8cba 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc @@ -10,8 +10,8 @@ #include "base/utf_string_conversions.h" #include "content/browser/plugin_service.h" #include "content/browser/renderer_host/render_message_filter.h" -#include "content/common/content_switches.h" #include "content/common/pepper_plugin_registry.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_switches.h" #include "net/base/network_change_notifier.h" #include "ppapi/proxy/ppapi_messages.h" diff --git a/content/browser/renderer_host/backing_store_manager.cc b/content/browser/renderer_host/backing_store_manager.cc index 75c7ccd..19e9807 100644 --- a/content/browser/renderer_host/backing_store_manager.cc +++ b/content/browser/renderer_host/backing_store_manager.cc @@ -9,8 +9,8 @@ #include "base/sys_info.h" #include "content/browser/renderer_host/backing_store.h" #include "content/browser/renderer_host/render_widget_host.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" +#include "content/public/common/content_switches.h" namespace { diff --git a/content/browser/renderer_host/backing_store_win.cc b/content/browser/renderer_host/backing_store_win.cc index fc093e8..f9c9bf7 100644 --- a/content/browser/renderer_host/backing_store_win.cc +++ b/content/browser/renderer_host/backing_store_win.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_widget_host.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "skia/ext/platform_canvas.h" #include "ui/gfx/gdi_util.h" #include "ui/gfx/surface/transport_dib.h" diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc index f3d21a8..66b5332 100644 --- a/content/browser/renderer_host/browser_render_process_host.cc +++ b/content/browser/renderer_host/browser_render_process_host.cc @@ -70,13 +70,13 @@ #include "content/browser/worker_host/worker_message_filter.h" #include "content/common/child_process_info.h" #include "content/common/child_process_messages.h" -#include "content/common/content_switches.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/notification_service.h" #include "content/common/process_watcher.h" #include "content/common/resource_messages.h" #include "content/common/result_codes.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "content/renderer/render_process_impl.h" #include "content/renderer/render_thread_impl.h" #include "ipc/ipc_logging.h" diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 553e8a01..de00cf1 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -29,11 +29,11 @@ #include "content/browser/renderer_host/render_widget_helper.h" #include "content/browser/resource_context.h" #include "content/browser/user_metrics.h" -#include "content/common/content_switches.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 "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_process_host.cc b/content/browser/renderer_host/render_process_host.cc index a7fc8d9..486e113 100644 --- a/content/browser/renderer_host/render_process_host.cc +++ b/content/browser/renderer_host/render_process_host.cc @@ -15,8 +15,8 @@ #include "content/common/child_process_info.h" #include "content/common/content_client.h" #include "content/common/content_constants.h" -#include "content/common/content_switches.h" #include "content/common/notification_service.h" +#include "content/public/common/content_switches.h" namespace { diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index 5921365..e15f7309 100644 --- a/content/browser/renderer_host/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc @@ -9,8 +9,8 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/content_switches.h" #include "content/common/test_url_constants.h" +#include "content/public/common/content_switches.h" RenderProcessHostTest::RenderProcessHostTest() { EnableDOMAutomation(); diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc index 47075f6..c7c58dc 100644 --- a/content/browser/renderer_host/render_widget_host.cc +++ b/content/browser/renderer_host/render_widget_host.cc @@ -20,12 +20,12 @@ #include "content/browser/renderer_host/render_widget_helper.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/user_metrics.h" -#include "content/common/content_switches.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "content/common/result_codes.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "ui/base/keycodes/keyboard_codes.h" #include "webkit/glue/webcursor.h" diff --git a/content/browser/renderer_host/render_widget_host_view_gtk.cc b/content/browser/renderer_host/render_widget_host_view_gtk.cc index 05a44a2c..11b3357 100644 --- a/content/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/content/browser/renderer_host/render_widget_host_view_gtk.cc @@ -31,8 +31,8 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/render_widget_host.h" -#include "content/common/content_switches.h" #include "content/common/native_web_keyboard_event.h" +#include "content/public/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index ff9d53f..2a3e0cb 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -25,11 +25,11 @@ #include "content/browser/renderer_host/backing_store_win.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_widget_host.h" -#include "content/common/content_switches.h" #include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "content/common/plugin_messages.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "skia/ext/skia_utils_win.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index 3c47be4..759273c 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -52,11 +52,11 @@ #include "content/browser/ssl/ssl_client_auth_handler.h" #include "content/browser/ssl/ssl_manager.h" #include "content/browser/worker_host/worker_service.h" -#include "content/common/content_switches.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 "net/base/auth.h" #include "net/base/cert_status_flags.h" #include "net/base/cookie_monster.h" diff --git a/content/browser/speech/speech_input_browsertest.cc b/content/browser/speech/speech_input_browsertest.cc index 46ac76e..4af042f 100644 --- a/content/browser/speech/speech_input_browsertest.cc +++ b/content/browser/speech/speech_input_browsertest.cc @@ -13,7 +13,7 @@ #include "content/browser/speech/speech_input_dispatcher_host.h" #include "content/browser/speech/speech_input_manager.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" namespace speech_input { diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc index 1cf92a6..044c742 100644 --- a/content/browser/tab_contents/render_view_host_manager.cc +++ b/content/browser/tab_contents/render_view_host_manager.cc @@ -18,11 +18,11 @@ #include "content/browser/webui/web_ui.h" #include "content/browser/webui/web_ui_factory.h" #include "content/common/content_client.h" -#include "content/common/content_switches.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" namespace base { class WaitableEvent; diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc index d77f25a..a9b0a79 100644 --- a/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc @@ -8,8 +8,8 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "content/browser/content_browser_client.h" -#include "content/common/content_switches.h" #include "content/common/utility_messages.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_switches.h" #include "ui/base/ui_base_switches.h" #include "webkit/plugins/plugin_switches.h" diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc index 4cccb2d..07bc27d 100644 --- a/content/browser/worker_host/worker_process_host.cc +++ b/content/browser/worker_host/worker_process_host.cc @@ -31,11 +31,11 @@ #include "content/browser/worker_host/message_port_service.h" #include "content/browser/worker_host/worker_message_filter.h" #include "content/browser/worker_host/worker_service.h" -#include "content/common/content_switches.h" #include "content/common/debug_flags.h" #include "content/common/result_codes.h" #include "content/common/view_messages.h" #include "content/common/worker_messages.h" +#include "content/public/common/content_switches.h" #include "net/base/mime_util.h" #include "ipc/ipc_switches.h" #include "net/base/registry_controlled_domain.h" diff --git a/content/browser/worker_host/worker_service.cc b/content/browser/worker_host/worker_service.cc index 0b4e3f2..93706d2 100644 --- a/content/browser/worker_host/worker_service.cc +++ b/content/browser/worker_host/worker_service.cc @@ -14,9 +14,9 @@ #include "content/browser/worker_host/worker_message_filter.h" #include "content/browser/worker_host/worker_process_host.h" #include "content/browser/worker_host/worker_service_observer.h" -#include "content/common/content_switches.h" #include "content/common/view_messages.h" #include "content/common/worker_messages.h" +#include "content/public/common/content_switches.h" #include "net/base/registry_controlled_domain.h" const int WorkerService::kMaxWorkerProcessesWhenSharing = 10; diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc index 172ddc1..7127d69 100644 --- a/content/browser/zygote_host_linux.cc +++ b/content/browser/zygote_host_linux.cc @@ -26,10 +26,10 @@ #include "base/utf_string_conversions.h" #include "content/browser/content_browser_client.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" -#include "content/common/content_switches.h" #include "content/common/process_watcher.h" #include "content/common/result_codes.h" #include "content/common/unix_domain_socket_posix.h" +#include "content/public/common/content_switches.h" #include "sandbox/linux/suid/suid_unsafe_environment_variables.h" #if defined(USE_TCMALLOC) diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc index 05e9e8f..aad5283 100644 --- a/content/browser/zygote_main_linux.cc +++ b/content/browser/zygote_main_linux.cc @@ -29,7 +29,6 @@ #include "build/build_config.h" #include "crypto/nss_util.h" #include "content/common/chrome_descriptors.h" -#include "content/common/content_switches.h" #include "content/common/font_config_ipc_linux.h" #include "content/common/main_function_params.h" #include "content/common/pepper_plugin_registry.h" @@ -40,6 +39,7 @@ #include "content/common/set_process_title.h" #include "content/common/unix_domain_socket_posix.h" #include "content/common/zygote_fork_delegate_linux.h" +#include "content/public/common/content_switches.h" #include "skia/ext/SkFontHost_fontconfig_control.h" #include "unicode/timezone.h" #include "ipc/ipc_channel.h" diff --git a/content/common/child_process_host.cc b/content/common/child_process_host.cc index 65a9b7a..3ac362a 100644 --- a/content/common/child_process_host.cc +++ b/content/common/child_process_host.cc @@ -13,7 +13,7 @@ #include "content/common/child_process_info.h" #include "content/common/child_process_messages.h" #include "content/common/content_paths.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_logging.h" #if defined(OS_LINUX) diff --git a/content/common/child_thread.cc b/content/common/child_thread.cc index bfde285..9c163ea 100644 --- a/content/common/child_thread.cc +++ b/content/common/child_thread.cc @@ -10,12 +10,12 @@ #include "content/common/child_process.h" #include "content/common/child_process_messages.h" #include "content/common/child_trace_message_filter.h" -#include "content/common/content_switches.h" #include "content/common/file_system/file_system_dispatcher.h" #include "content/common/notification_service.h" #include "content/common/quota_dispatcher.h" #include "content/common/resource_dispatcher.h" #include "content/common/socket_stream_dispatcher.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_sync_channel.h" #include "ipc/ipc_sync_message_filter.h" diff --git a/content/common/debug_flags.cc b/content/common/debug_flags.cc index 6b6dfef..aec7a5f 100644 --- a/content/common/debug_flags.cc +++ b/content/common/debug_flags.cc @@ -7,7 +7,7 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_switches.h" bool DebugFlags::ProcessDebugFlags(CommandLine* command_line, diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc index f1489e2..2057d33 100644 --- a/content/common/gpu/gpu_channel.cc +++ b/content/common/gpu/gpu_channel.cc @@ -14,10 +14,10 @@ #include "base/string_util.h" #include "content/common/child_process.h" #include "content/common/content_client.h" -#include "content/common/content_switches.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_switches.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_surface.h" diff --git a/content/common/handle_enumerator_win.cc b/content/common/handle_enumerator_win.cc index c95ac10..e3985af 100644 --- a/content/common/handle_enumerator_win.cc +++ b/content/common/handle_enumerator_win.cc @@ -13,8 +13,8 @@ #include "base/process_util.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" -#include "content/common/content_switches.h" #include "content/common/result_codes.h" +#include "content/public/common/content_switches.h" #include "sandbox/src/handle_table.h" namespace { diff --git a/content/common/npobject_stub.cc b/content/common/npobject_stub.cc index ee82a31..4db6a28 100644 --- a/content/common/npobject_stub.cc +++ b/content/common/npobject_stub.cc @@ -6,10 +6,10 @@ #include "base/command_line.h" #include "content/common/content_client.h" -#include "content/common/content_switches.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_switches.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h" diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc index 38304d3..fd706ea 100644 --- a/content/common/pepper_plugin_registry.cc +++ b/content/common/pepper_plugin_registry.cc @@ -11,7 +11,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "content/common/content_client.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "webkit/plugins/npapi/plugin_list.h" namespace { diff --git a/content/common/sandbox_init_wrapper_mac.cc b/content/common/sandbox_init_wrapper_mac.cc index afb4296..7054a6e8 100644 --- a/content/common/sandbox_init_wrapper_mac.cc +++ b/content/common/sandbox_init_wrapper_mac.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/logging.h" -#include "content/common/content_switches.h" #include "content/common/sandbox_mac.h" +#include "content/public/common/content_switches.h" bool SandboxInitWrapper::InitializeSandbox(const CommandLine& command_line, const std::string& process_type) { diff --git a/content/common/sandbox_init_wrapper_win.cc b/content/common/sandbox_init_wrapper_win.cc index 18a5e99..e430c8c 100644 --- a/content/common/sandbox_init_wrapper_win.cc +++ b/content/common/sandbox_init_wrapper_win.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/logging.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" void SandboxInitWrapper::SetServices(sandbox::SandboxInterfaceInfo* info) { if (!info) diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index 426efa7..21246ef 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -28,7 +28,7 @@ extern "C" { #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "content/common/chrome_application_mac.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "unicode/uchar.h" #include "ui/gfx/gl/gl_surface.h" diff --git a/content/common/sandbox_policy.cc b/content/common/sandbox_policy.cc index f9a442c..c919002 100644 --- a/content/common/sandbox_policy.cc +++ b/content/common/sandbox_policy.cc @@ -17,9 +17,9 @@ #include "base/string_util.h" #include "base/win/windows_version.h" #include "content/common/content_client.h" -#include "content/common/content_switches.h" #include "content/common/child_process_info.h" #include "content/common/debug_flags.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/seccomp_sandbox.h b/content/common/seccomp_sandbox.h index c1c1f8f..0f29d64 100644 --- a/content/common/seccomp_sandbox.h +++ b/content/common/seccomp_sandbox.h @@ -15,7 +15,7 @@ // release. #include "build/build_config.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \ !defined(__clang__) && !defined(OS_CHROMEOS) && !defined(TOOLKIT_VIEWS) diff --git a/content/content_common.gypi b/content/content_common.gypi index 93d2e91..a298a56 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -29,6 +29,8 @@ ], 'sources': [ 'public/common/bindings_policy.h', + 'public/common/content_switches.cc', + 'public/common/content_switches.h', 'public/common/page_transition_types.cc', 'public/common/page_transition_types.h', 'public/common/resource_dispatcher_delegate.h', @@ -72,8 +74,6 @@ 'common/content_paths.cc', 'common/content_paths.h', 'common/content_restriction.h', - 'common/content_switches.cc', - 'common/content_switches.h', 'common/css_colors.h', 'common/database_messages.h', 'common/database_util.cc', diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index c854fb3..f21db0e 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -13,8 +13,8 @@ #include "build/build_config.h" #include "content/common/child_process.h" #include "content/common/content_client.h" -#include "content/common/content_switches.h" #include "content/common/gpu/gpu_messages.h" +#include "content/public/common/content_switches.h" #include "content/gpu/gpu_info_collector.h" #include "content/gpu/gpu_watchdog_thread.h" #include "ipc/ipc_channel_handle.h" diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 198af14..b29323f 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -14,9 +14,9 @@ #include "base/threading/platform_thread.h" #include "base/win/scoped_com_initializer.h" #include "build/build_config.h" -#include "content/common/content_switches.h" #include "content/common/gpu/gpu_config.h" #include "content/common/main_function_params.h" +#include "content/public/common/content_switches.h" #include "content/gpu/gpu_child_thread.h" #include "content/gpu/gpu_process.h" #include "ui/gfx/gl/gl_surface.h" diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index a9a12a6..faf0a63 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -11,8 +11,8 @@ #include "base/synchronization/waitable_event.h" #include "build/build_config.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/plugin_messages.h" +#include "content/public/common/content_switches.h" #include "content/plugin/plugin_thread.h" #include "content/plugin/webplugin_delegate_stub.h" #include "content/plugin/webplugin_proxy.h" diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc index 63d5d68..1f927459 100644 --- a/content/plugin/plugin_main.cc +++ b/content/plugin/plugin_main.cc @@ -15,10 +15,10 @@ #include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "content/plugin/plugin_thread.h" +#include "content/public/common/content_switches.h" #if defined(OS_WIN) #include "content/common/injection_test_dll.h" diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index 89c8307..195bffe 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -20,9 +20,9 @@ #include "base/process_util.h" #include "base/threading/thread_local.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/npobject_util.h" #include "content/common/plugin_messages.h" +#include "content/public/common/content_switches.h" #include "content/public/plugin/content_plugin_client.h" #include "ipc/ipc_channel_handle.h" #include "webkit/glue/webkit_glue.h" diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc index 73d28b2..acf6b53 100644 --- a/content/plugin/webplugin_delegate_stub.cc +++ b/content/plugin/webplugin_delegate_stub.cc @@ -10,12 +10,12 @@ #include "base/string_number_conversions.h" #include "content/common/content_client.h" #include "content/common/content_constants.h" -#include "content/common/content_switches.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_switches.h" #include "third_party/npapi/bindings/npapi.h" #include "third_party/npapi/bindings/npruntime.h" #include "skia/ext/platform_device.h" diff --git a/content/ppapi_plugin/ppapi_broker_main.cc b/content/ppapi_plugin/ppapi_broker_main.cc index 6933348..17cd7b7 100644 --- a/content/ppapi_plugin/ppapi_broker_main.cc +++ b/content/ppapi_plugin/ppapi_broker_main.cc @@ -6,9 +6,9 @@ #include "base/threading/platform_thread.h" #include "build/build_config.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/main_function_params.h" #include "content/ppapi_plugin/ppapi_thread.h" +#include "content/public/common/content_switches.h" // Main function for starting the PPAPI broker process. int PpapiBrokerMain(const MainFunctionParams& parameters) { diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc index c25ce4b..f732c12 100644 --- a/content/ppapi_plugin/ppapi_plugin_main.cc +++ b/content/ppapi_plugin/ppapi_plugin_main.cc @@ -8,9 +8,9 @@ #include "base/threading/platform_thread.h" #include "build/build_config.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/main_function_params.h" #include "content/ppapi_plugin/ppapi_thread.h" +#include "content/public/common/content_switches.h" #include "ppapi/proxy/proxy_module.h" #if defined(OS_WIN) diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 6d89839..d0e9b6c 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -11,11 +11,11 @@ #include "base/rand_util.h" #include "base/stringprintf.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/sandbox_init_wrapper.h" #include "content/ppapi_plugin/broker_process_dispatcher.h" #include "content/ppapi_plugin/plugin_process_dispatcher.h" #include "content/ppapi_plugin/ppapi_webkit_thread.h" +#include "content/public/common/content_switches.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_sync_channel.h" #include "ppapi/c/dev/ppp_network_state_dev.h" diff --git a/content/common/content_switches.cc b/content/public/common/content_switches.cc index 7c066bd..c182fec 100644 --- a/content/common/content_switches.cc +++ b/content/public/common/content_switches.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_switches.h" +#include "content/public/common/content_switches.h" namespace switches { diff --git a/content/common/content_switches.h b/content/public/common/content_switches.h index 32a65e5..1c9b708 100644 --- a/content/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -4,8 +4,8 @@ // Defines all the "content" command-line switches. -#ifndef CONTENT_COMMON_CONTENT_SWITCHES_H_ -#define CONTENT_COMMON_CONTENT_SWITCHES_H_ +#ifndef CONTENT_PUBLIC_COMMON_CONTENT_SWITCHES_H_ +#define CONTENT_PUBLIC_COMMON_CONTENT_SWITCHES_H_ #pragma once #include "build/build_config.h" @@ -170,4 +170,4 @@ CONTENT_EXPORT extern const char kRendererCheckFalseTest[]; } // namespace switches -#endif // CONTENT_COMMON_CONTENT_SWITCHES_H_ +#endif // CONTENT_PUBLIC_COMMON_CONTENT_SWITCHES_H_ diff --git a/content/renderer/devtools_agent.cc b/content/renderer/devtools_agent.cc index d7f6a63..7516b2d 100644 --- a/content/renderer/devtools_agent.cc +++ b/content/renderer/devtools_agent.cc @@ -10,11 +10,11 @@ #include "base/message_loop.h" #include "base/process.h" #include "base/string_number_conversions.h" -#include "content/common/content_switches.h" -#include "content/renderer/devtools_agent_filter.h" -#include "content/renderer/devtools_client.h" #include "content/common/devtools_messages.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" +#include "content/renderer/devtools_agent_filter.h" +#include "content/renderer/devtools_client.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPoint.h" diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools_client.cc index 5d8c5af..84b45aa 100644 --- a/content/renderer/devtools_client.cc +++ b/content/renderer/devtools_client.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "content/common/content_switches.h" #include "content/common/devtools_messages.h" +#include "content/public/common/content_switches.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontend.h" diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc index 4def872..77f8620 100644 --- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc @@ -23,7 +23,7 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/synchronization/lock.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "content/renderer/gpu/gpu_channel_host.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc index fe72c54..4697c32 100644 --- a/content/renderer/media/audio_renderer_impl.cc +++ b/content/renderer/media/audio_renderer_impl.cc @@ -11,8 +11,8 @@ #include "base/bind.h" #include "base/command_line.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/media/audio_messages.h" +#include "content/public/common/content_switches.h" #include "content/renderer/render_thread_impl.h" #include "media/audio/audio_buffers_state.h" #include "media/audio/audio_output_controller.h" diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index 5966fdb..e6b6fab 100644 --- a/content/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -20,7 +20,6 @@ #include "base/time.h" #include "content/common/child_process.h" #include "content/common/child_thread.h" -#include "content/common/content_switches.h" #include "content/common/file_system/file_system_dispatcher.h" #include "content/common/file_system_messages.h" #include "content/common/media/audio_messages.h" @@ -29,6 +28,7 @@ #include "content/common/pepper_messages.h" #include "content/common/quota_dispatcher.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/gpu/command_buffer_proxy.h" #include "content/renderer/gpu/gpu_channel_host.h" diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index cdc7b22..5fe8557 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc @@ -19,8 +19,8 @@ #include "base/sys_info.h" #include "base/utf_string_conversions.h" #include "content/common/child_thread.h" -#include "content/common/content_switches.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "content/public/renderer/content_renderer_client.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_message_utils.h" diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 9aa51ac..c02c765 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -22,7 +22,6 @@ #include "base/threading/thread_local.h" #include "base/values.h" #include "content/common/appcache/appcache_dispatcher.h" -#include "content/common/content_switches.h" #include "content/common/database_messages.h" #include "content/common/db_message_filter.h" #include "content/common/dom_storage_messages.h" @@ -34,6 +33,7 @@ #include "content/common/resource_messages.h" #include "content/common/view_messages.h" #include "content/common/web_database_observer_impl.h" +#include "content/public/common/content_switches.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_process_observer.h" #include "content/public/renderer/render_view_visitor.h" diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 0e6ae15..c8564fc 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -27,7 +27,6 @@ #include "content/common/appcache/appcache_dispatcher.h" #include "content/common/clipboard_messages.h" #include "content/common/content_constants.h" -#include "content/common/content_switches.h" #include "content/common/database_messages.h" #include "content/common/drag_messages.h" #include "content/common/file_system/file_system_dispatcher.h" @@ -42,6 +41,7 @@ #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/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/render_widget.cc b/content/renderer/render_widget.cc index 55d012c..e4333a9 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -12,9 +12,9 @@ #include "base/metrics/histogram.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" -#include "content/common/content_switches.h" #include "content/common/swapped_out_messages.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "content/renderer/gpu/compositor_thread.h" #include "content/renderer/render_process.h" #include "content/renderer/render_thread_impl.h" diff --git a/content/renderer/renderer_accessibility.cc b/content/renderer/renderer_accessibility.cc index 8a583ac..bae518b1 100644 --- a/content/renderer/renderer_accessibility.cc +++ b/content/renderer/renderer_accessibility.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "content/common/content_switches.h" #include "content/common/view_messages.h" +#include "content/public/common/content_switches.h" #include "content/renderer/render_view_impl.h" #include "content/renderer/renderer_accessibility.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h" diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc index f609879..373aae6 100644 --- a/content/renderer/renderer_glue.cc +++ b/content/renderer/renderer_glue.cc @@ -18,11 +18,11 @@ #include "base/string_util.h" #include "content/common/clipboard_messages.h" #include "content/common/content_client.h" -#include "content/common/content_switches.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/renderer/content_renderer_client.h" #include "content/renderer/render_thread_impl.h" #include "googleurl/src/url_util.h" diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 53db07f..b5147c5 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -18,10 +18,10 @@ #include "base/threading/platform_thread.h" #include "base/time.h" #include "content/common/content_counters.h" -#include "content/common/content_switches.h" #include "content/common/main_function_params.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/pepper_plugin_registry.h" +#include "content/public/common/content_switches.h" #include "content/renderer/render_process_impl.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/renderer_main_platform_delegate.h" diff --git a/content/renderer/renderer_main_platform_delegate_linux.cc b/content/renderer/renderer_main_platform_delegate_linux.cc index 8acc7f5..d990a7f 100644 --- a/content/renderer/renderer_main_platform_delegate_linux.cc +++ b/content/renderer/renderer_main_platform_delegate_linux.cc @@ -5,8 +5,8 @@ #include "content/renderer/renderer_main_platform_delegate.h" #include "base/command_line.h" -#include "content/common/content_switches.h" #include "content/common/seccomp_sandbox.h" +#include "content/public/common/content_switches.h" RendererMainPlatformDelegate::RendererMainPlatformDelegate( const MainFunctionParams& parameters) diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm index 930e2c8..ab17d012 100644 --- a/content/renderer/renderer_main_platform_delegate_mac.mm +++ b/content/renderer/renderer_main_platform_delegate_mac.mm @@ -10,10 +10,10 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/sys_string_conversions.h" +#import "chrome/test/security_tests/renderer_sandbox_tests_mac.h" #import "content/common/chrome_application_mac.h" -#include "content/common/content_switches.h" #include "content/common/sandbox_mac.h" -#import "chrome/test/security_tests/renderer_sandbox_tests_mac.h" +#include "content/public/common/content_switches.h" #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h" RendererMainPlatformDelegate::RendererMainPlatformDelegate( diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc index 4f1eaf5..e3b97e0 100644 --- a/content/renderer/renderer_main_platform_delegate_win.cc +++ b/content/renderer/renderer_main_platform_delegate_win.cc @@ -7,8 +7,8 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "content/common/content_switches.h" #include "content/common/injection_test_dll.h" +#include "content/public/common/content_switches.h" #include "sandbox/src/sandbox.h" #include "unicode/timezone.h" diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index b950713..2028ba0 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -10,7 +10,6 @@ #include "base/platform_file.h" #include "base/shared_memory.h" #include "base/utf_string_conversions.h" -#include "content/common/content_switches.h" #include "content/common/database_util.h" #include "content/common/file_system/webfilesystem_impl.h" #include "content/common/file_utilities_messages.h" @@ -19,6 +18,7 @@ #include "content/common/view_messages.h" #include "content/common/webblobregistry_impl.h" #include "content/common/webmessageportchannel_impl.h" +#include "content/public/common/content_switches.h" #include "content/public/renderer/content_renderer_client.h" #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" #include "content/renderer/media/audio_device.h" diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index a0ffe67..13dd6da 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -5,7 +5,7 @@ #include "content/shell/shell_main_delegate.h" #include "base/command_line.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "content/shell/shell_content_browser_client.h" #include "content/shell/shell_content_plugin_client.h" #include "content/shell/shell_content_renderer_client.h" diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index 0fe5ba5..f5074cd8 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -11,7 +11,7 @@ #include "base/scoped_temp_dir.h" #include "base/test/test_suite.h" #include "content/app/content_main.h" -#include "content/common/content_switches.h" +#include "content/public/common/content_switches.h" #include "content/shell/shell_main_delegate.h" #if defined(OS_WIN) diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc index a2a3ea4..b66cfa9 100644 --- a/content/utility/utility_main.cc +++ b/content/utility/utility_main.cc @@ -7,9 +7,9 @@ #include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "content/common/child_process.h" -#include "content/common/content_switches.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" +#include "content/public/common/content_switches.h" #include "content/utility/utility_thread.h" #if defined(OS_WIN) diff --git a/content/worker/webworkerclient_proxy.cc b/content/worker/webworkerclient_proxy.cc index 508ab30..e35036c 100644 --- a/content/worker/webworkerclient_proxy.cc +++ b/content/worker/webworkerclient_proxy.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "base/message_loop.h" -#include "content/common/content_switches.h" #include "content/common/file_system/file_system_dispatcher.h" #include "content/common/file_system/webfilesystem_callback_dispatcher.h" #include "content/common/webmessageportchannel_impl.h" #include "content/common/worker_messages.h" +#include "content/public/common/content_switches.h" // TODO(jam): uncomment this and WebWorkerClientProxy::createWorker when the // renderer worker code moves to content. This code isn't used now since we // don't support nested workers anyways. diff --git a/content/worker/worker_thread.cc b/content/worker/worker_thread.cc index 1560e5b..09b4c9c 100644 --- a/content/worker/worker_thread.cc +++ b/content/worker/worker_thread.cc @@ -8,10 +8,10 @@ #include "base/lazy_instance.h" #include "base/threading/thread_local.h" #include "content/common/appcache/appcache_dispatcher.h" -#include "content/common/content_switches.h" #include "content/common/db_message_filter.h" #include "content/common/web_database_observer_impl.h" #include "content/common/worker_messages.h" +#include "content/public/common/content_switches.h" #include "content/worker/webworker_stub.h" #include "content/worker/websharedworker_stub.h" #include "content/worker/worker_webkitplatformsupport_impl.h" |