diff options
123 files changed, 395 insertions, 394 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 49a36659..7f4af43 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -157,7 +157,8 @@ _BANNED_CPP_FUNCTIONS = ( ), True, ( - r"^content[\\\/]shell[\\\/]shell_browser_main\.cc$", + r"^content[\\\/]shell[\\\/]browser[\\\/]shell_browser_main\.cc$", + r"^content[\\\/]shell[\\\/]browser[\\\/]shell_message_filter\.cc$", r"^net[\\\/]disk_cache[\\\/]cache_util\.cc$", ), ), diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index fae491f..1dc0b3e 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -18,8 +18,8 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "content/public/common/content_switches.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_net_log.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_net_log.h" #include "net/base/net_module.h" #include "ui/aura/client/stacking_client.h" #include "ui/aura/env.h" diff --git a/ash/shell/content_client/shell_content_browser_client.cc b/ash/shell/content_client/shell_content_browser_client.cc index 93fc834..ec24bc7 100644 --- a/ash/shell/content_client/shell_content_browser_client.cc +++ b/ash/shell/content_client/shell_content_browser_client.cc @@ -5,7 +5,7 @@ #include "ash/shell/content_client/shell_content_browser_client.h" #include "ash/shell/content_client/shell_browser_main_parts.h" -#include "content/shell/shell_browser_context.h" +#include "content/shell/browser/shell_browser_context.h" #include "third_party/skia/include/core/SkBitmap.h" namespace ash { diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index 0be9ba5..a631c69 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc @@ -17,7 +17,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/accessibility_browser_test_utils.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc index 5e3effe..4f4d93c 100644 --- a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc +++ b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc @@ -10,7 +10,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_widget_host_view.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/accessibility_browser_test_utils.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index d0ff119..355cc32 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -21,7 +21,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h" #include "content/public/common/url_constants.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/accessibility_browser_test_utils.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/bookmarklet_browsertest.cc b/content/browser/bookmarklet_browsertest.cc index 02f4193..35523ee 100644 --- a/content/browser/bookmarklet_browsertest.cc +++ b/content/browser/bookmarklet_browsertest.cc @@ -6,7 +6,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc index c50e8cf..8112296 100644 --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc @@ -26,7 +26,7 @@ #include "content/public/common/drop_data.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc index db27a533..c7cfe39 100644 --- a/content/browser/child_process_security_policy_browsertest.cc +++ b/content/browser/child_process_security_policy_browsertest.cc @@ -10,7 +10,7 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/result_codes.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/database_browsertest.cc b/content/browser/database_browsertest.cc index 305d8ff..373a06f 100644 --- a/content/browser/database_browsertest.cc +++ b/content/browser/database_browsertest.cc @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc index 095e85f..92a83c7 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/provider.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index 79955a8..b2aa9f1 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc @@ -7,7 +7,7 @@ #include "content/common/dom_storage/dom_storage_types.h" #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index 516ae18..b638cfa 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc @@ -26,10 +26,10 @@ #include "content/public/test/download_test_observer.h" #include "content/public/test/test_file_error_injector.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_download_manager_delegate.h" -#include "content/shell/shell_network_delegate.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_download_manager_delegate.h" +#include "content/shell/browser/shell_network_delegate.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" diff --git a/content/browser/download/drag_download_file_browsertest.cc b/content/browser/download/drag_download_file_browsertest.cc index fc35d6c..a4f5005 100644 --- a/content/browser/download/drag_download_file_browsertest.cc +++ b/content/browser/download/drag_download_file_browsertest.cc @@ -16,9 +16,9 @@ #include "content/public/common/content_client.h" #include "content/public/test/download_test_observer.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_download_manager_delegate.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_download_manager_delegate.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index 07bffed..7e99fb26 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.cc @@ -9,7 +9,7 @@ #include "base/run_loop.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc index cfa63ed..3910332 100644 --- a/content/browser/download/save_package_browsertest.cc +++ b/content/browser/download/save_package_browsertest.cc @@ -4,7 +4,7 @@ #include "base/files/scoped_temp_dir.h" #include "content/browser/download/save_package.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index 6a79a40..eafb1b1 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -13,7 +13,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "webkit/browser/quota/quota_manager.h" diff --git a/content/browser/gpu/gpu_crash_browsertest.cc b/content/browser/gpu/gpu_crash_browsertest.cc index eafbc68..98650d3 100644 --- a/content/browser/gpu/gpu_crash_browsertest.cc +++ b/content/browser/gpu/gpu_crash_browsertest.cc @@ -10,7 +10,7 @@ #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/gpu/gpu_functional_browsertest.cc b/content/browser/gpu/gpu_functional_browsertest.cc index b3c2a57..1bef1fb 100644 --- a/content/browser/gpu/gpu_functional_browsertest.cc +++ b/content/browser/gpu/gpu_functional_browsertest.cc @@ -10,7 +10,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/gpu/gpu_memory_test.cc b/content/browser/gpu/gpu_memory_test.cc index cb74a62..1ccfab6 100644 --- a/content/browser/gpu/gpu_memory_test.cc +++ b/content/browser/gpu/gpu_memory_test.cc @@ -12,7 +12,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "gpu/command_buffer/service/gpu_switches.h" diff --git a/content/browser/gpu/gpu_pixel_browsertest.cc b/content/browser/gpu/gpu_pixel_browsertest.cc index 5909321..3eaf857 100644 --- a/content/browser/gpu/gpu_pixel_browsertest.cc +++ b/content/browser/gpu/gpu_pixel_browsertest.cc @@ -16,7 +16,7 @@ #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "gpu/config/gpu_test_config.h" diff --git a/content/browser/gpu/webgl_conformance_test.cc b/content/browser/gpu/webgl_conformance_test.cc index 79f3078..e8fb8a5 100644 --- a/content/browser/gpu/webgl_conformance_test.cc +++ b/content/browser/gpu/webgl_conformance_test.cc @@ -10,7 +10,7 @@ #include "content/public/common/content_paths.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "gpu/config/gpu_test_config.h" diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index ac541e7..e41e281 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc @@ -21,7 +21,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "webkit/browser/database/database_util.h" diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc index cb8896f..0a763fe 100644 --- a/content/browser/loader/resource_dispatcher_host_browsertest.cc +++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc @@ -15,9 +15,9 @@ #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_network_delegate.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_network_delegate.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_failed_job.h" diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc index ce5dc4e..37d261f 100644 --- a/content/browser/media/encrypted_media_browsertest.cc +++ b/content/browser/media/encrypted_media_browsertest.cc @@ -9,7 +9,7 @@ #include "content/browser/media/media_browsertest.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc index 1d83035..319c558 100644 --- a/content/browser/media/media_browsertest.cc +++ b/content/browser/media/media_browsertest.cc @@ -9,7 +9,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test_utils.h" // TODO(wolenetz): Fix Media.YUV* tests on MSVS 2012 x64. crbug.com/180074 diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 7cf48b0..4e050e8 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -8,7 +8,7 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/media/webrtc_internals_browsertest.cc b/content/browser/media/webrtc_internals_browsertest.cc index 71bbe53..6e9d4fd 100644 --- a/content/browser/media/webrtc_internals_browsertest.cc +++ b/content/browser/media/webrtc_internals_browsertest.cc @@ -9,7 +9,7 @@ #include "base/values.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index c1dfa1f..37e1fa9 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -9,8 +9,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" +#include "content/shell/browser/shell.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_mock_http_job.h" diff --git a/content/browser/plugin_data_remover_impl_browsertest.cc b/content/browser/plugin_data_remover_impl_browsertest.cc index 37672ee..8308a51 100644 --- a/content/browser/plugin_data_remover_impl_browsertest.cc +++ b/content/browser/plugin_data_remover_impl_browsertest.cc @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" namespace content { diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index 1abf725..e99f3e5 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc @@ -15,7 +15,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index 9ee8036..de64924 100644 --- a/content/browser/renderer_host/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc @@ -8,7 +8,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_notification_tracker.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index 4255d05..20fec72 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/host_port_pair.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 f5ebb76..828dadc 100644 --- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -25,7 +25,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc index 2a9ef56..bfdf6a5 100644 --- a/content/browser/renderer_host/render_widget_host_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_browsertest.cc @@ -7,7 +7,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 2b47ff1..3675ece 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -18,7 +18,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "media/base/video_frame.h" diff --git a/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc index 76070bc..7a35dd8 100644 --- a/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_win_browsertest.cc @@ -10,11 +10,11 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" -#include "content/public/test/test_utils.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" -#include "content/test/content_browser_test_utils.h" +#include "content/public/test/test_utils.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" +#include "content/test/content_browser_test_utils.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_type.h" #include "ui/base/ime/win/imm32_manager.h" diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index bc554c2..2eb7b51 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc @@ -9,7 +9,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/common/content_switches.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index 966ccc7..7d006b6 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -12,7 +12,7 @@ #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 3485fc5..e37ac97 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc @@ -13,7 +13,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index e532bc7..59b7474 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -18,7 +18,7 @@ #include "content/public/common/url_constants.h" #include "content/public/test/fake_speech_recognition_manager.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "third_party/WebKit/public/web/WebInputEvent.h" diff --git a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc index ce0a702..e241d51 100644 --- a/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc +++ b/content/browser/web_contents/touch_editable_impl_aura_browsertest.cc @@ -16,7 +16,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "ui/aura/root_window.h" diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index 0cb9fe2..70ab523 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc @@ -14,7 +14,7 @@ #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index e0f34ab..df90be7 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc @@ -18,7 +18,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "ui/aura/root_window.h" diff --git a/content/browser/webkit_browsertest.cc b/content/browser/webkit_browsertest.cc index 24c24a6..5394f5b 100644 --- a/content/browser/webkit_browsertest.cc +++ b/content/browser/webkit_browsertest.cc @@ -4,7 +4,7 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/web_contents.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "content/test/net/url_request_abort_on_end_job.h" diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index ca87c5d0..326e01f 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -17,9 +17,9 @@ #include "content/public/common/content_paths.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_resource_dispatcher_host_delegate.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/test_data_directory.h" diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 10cb53a..e6e5b6a 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -68,11 +68,73 @@ 'shell/app/shell_main_delegate.h', 'shell/app/shell_main_delegate_mac.h', 'shell/app/shell_main_delegate_mac.mm', - 'shell/app/webkit_test_platform_support.h', 'shell/app/webkit_test_platform_support_android.cc', + 'shell/app/webkit_test_platform_support.h', 'shell/app/webkit_test_platform_support_linux.cc', 'shell/app/webkit_test_platform_support_mac.mm', 'shell/app/webkit_test_platform_support_win.cc', + 'shell/browser/minimal_shell.cc', + 'shell/browser/minimal_shell.h', + 'shell/browser/notify_done_forwarder.cc', + 'shell/browser/notify_done_forwarder.h', + 'shell/browser/shell_android.cc', + 'shell/browser/shell_application_mac.h', + 'shell/browser/shell_application_mac.mm', + 'shell/browser/shell_aura.cc', + 'shell/browser/shell_browser_context.cc', + 'shell/browser/shell_browser_context.h', + 'shell/browser/shell_browser_main.cc', + 'shell/browser/shell_browser_main.h', + 'shell/browser/shell_browser_main_parts.cc', + 'shell/browser/shell_browser_main_parts.h', + 'shell/browser/shell_browser_main_parts_mac.mm', + 'shell/browser/shell.cc', + 'shell/browser/shell_content_browser_client.cc', + 'shell/browser/shell_content_browser_client.h', + 'shell/browser/shell_devtools_delegate.cc', + 'shell/browser/shell_devtools_delegate.h', + 'shell/browser/shell_devtools_frontend.cc', + 'shell/browser/shell_devtools_frontend.h', + 'shell/browser/shell_download_manager_delegate.cc', + 'shell/browser/shell_download_manager_delegate.h', + 'shell/browser/shell_gtk.cc', + 'shell/browser/shell.h', + 'shell/browser/shell_javascript_dialog_gtk.cc', + 'shell/browser/shell_javascript_dialog.h', + 'shell/browser/shell_javascript_dialog_mac.mm', + 'shell/browser/shell_javascript_dialog_manager.cc', + 'shell/browser/shell_javascript_dialog_manager.h', + 'shell/browser/shell_javascript_dialog_win.cc', + 'shell/browser/shell_layout_tests_android.cc', + 'shell/browser/shell_layout_tests_android.h', + 'shell/browser/shell_login_dialog.cc', + 'shell/browser/shell_login_dialog_gtk.cc', + 'shell/browser/shell_login_dialog.h', + 'shell/browser/shell_login_dialog_mac.mm', + 'shell/browser/shell_mac.mm', + 'shell/browser/shell_message_filter.cc', + 'shell/browser/shell_message_filter.h', + 'shell/browser/shell_net_log.cc', + 'shell/browser/shell_net_log.h', + 'shell/browser/shell_network_delegate.cc', + 'shell/browser/shell_network_delegate.h', + 'shell/browser/shell_plugin_service_filter.cc', + 'shell/browser/shell_plugin_service_filter.h', + 'shell/browser/shell_quota_permission_context.cc', + 'shell/browser/shell_quota_permission_context.h', + 'shell/browser/shell_resource_dispatcher_host_delegate.cc', + 'shell/browser/shell_resource_dispatcher_host_delegate.h', + 'shell/browser/shell_url_request_context_getter.cc', + 'shell/browser/shell_url_request_context_getter.h', + 'shell/browser/shell_web_contents_view_delegate_android.cc', + 'shell/browser/shell_web_contents_view_delegate_creator.h', + 'shell/browser/shell_web_contents_view_delegate_gtk.cc', + 'shell/browser/shell_web_contents_view_delegate.h', + 'shell/browser/shell_web_contents_view_delegate_mac.mm', + 'shell/browser/shell_web_contents_view_delegate_win.cc', + 'shell/browser/shell_win.cc', + 'shell/browser/webkit_test_controller.cc', + 'shell/browser/webkit_test_controller.h', 'shell/common/shell_content_client.cc', 'shell/common/shell_content_client.h', 'shell/common/shell_messages.cc', @@ -85,10 +147,6 @@ 'shell/common/webkit_test_helpers.h', 'shell/geolocation/shell_access_token_store.cc', 'shell/geolocation/shell_access_token_store.h', - 'shell/minimal_shell.cc', - 'shell/minimal_shell.h', - 'shell/notify_done_forwarder.cc', - 'shell/notify_done_forwarder.h', 'shell/renderer/gc_extension.cc', 'shell/renderer/gc_extension.h', 'shell/renderer/shell_content_renderer_client.cc', @@ -99,64 +157,6 @@ 'shell/renderer/shell_render_view_observer.h', 'shell/renderer/webkit_test_runner.cc', 'shell/renderer/webkit_test_runner.h', - 'shell/shell.cc', - 'shell/shell.h', - 'shell/shell_android.cc', - 'shell/shell_aura.cc', - 'shell/shell_gtk.cc', - 'shell/shell_mac.mm', - 'shell/shell_win.cc', - 'shell/shell_application_mac.h', - 'shell/shell_application_mac.mm', - 'shell/shell_browser_context.cc', - 'shell/shell_browser_context.h', - 'shell/shell_browser_main.cc', - 'shell/shell_browser_main.h', - 'shell/shell_browser_main_parts.cc', - 'shell/shell_browser_main_parts.h', - 'shell/shell_browser_main_parts_mac.mm', - 'shell/shell_content_browser_client.cc', - 'shell/shell_content_browser_client.h', - 'shell/shell_devtools_delegate.cc', - 'shell/shell_devtools_delegate.h', - 'shell/shell_devtools_frontend.cc', - 'shell/shell_devtools_frontend.h', - 'shell/shell_download_manager_delegate.cc', - 'shell/shell_download_manager_delegate.h', - 'shell/shell_javascript_dialog_manager.cc', - 'shell/shell_javascript_dialog_manager.h', - 'shell/shell_javascript_dialog_gtk.cc', - 'shell/shell_javascript_dialog_mac.mm', - 'shell/shell_javascript_dialog_win.cc', - 'shell/shell_javascript_dialog.h', - 'shell/shell_layout_tests_android.cc', - 'shell/shell_layout_tests_android.h', - 'shell/shell_login_dialog_gtk.cc', - 'shell/shell_login_dialog_mac.mm', - 'shell/shell_login_dialog.cc', - 'shell/shell_login_dialog.h', - 'shell/shell_message_filter.cc', - 'shell/shell_message_filter.h', - 'shell/shell_net_log.cc', - 'shell/shell_net_log.h', - 'shell/shell_network_delegate.cc', - 'shell/shell_network_delegate.h', - 'shell/shell_plugin_service_filter.cc', - 'shell/shell_plugin_service_filter.h', - 'shell/shell_quota_permission_context.cc', - 'shell/shell_quota_permission_context.h', - 'shell/shell_resource_dispatcher_host_delegate.cc', - 'shell/shell_resource_dispatcher_host_delegate.h', - 'shell/shell_url_request_context_getter.cc', - 'shell/shell_url_request_context_getter.h', - 'shell/shell_web_contents_view_delegate_android.cc', - 'shell/shell_web_contents_view_delegate_creator.h', - 'shell/shell_web_contents_view_delegate_gtk.cc', - 'shell/shell_web_contents_view_delegate_mac.mm', - 'shell/shell_web_contents_view_delegate_win.cc', - 'shell/shell_web_contents_view_delegate.h', - 'shell/webkit_test_controller.cc', - 'shell/webkit_test_controller.h', ], 'msvs_settings': { 'VCLinkerTool': { @@ -220,8 +220,8 @@ '../ui/ui.gyp:ui_resources', ], 'sources/': [ - ['exclude', 'shell/shell_gtk.cc'], - ['exclude', 'shell/shell_win.cc'], + ['exclude', 'shell/browser/shell_gtk.cc'], + ['exclude', 'shell/browser/shell_win.cc'], ], }], # use_aura==1 ['chromeos==1', { @@ -241,8 +241,8 @@ }], ['enable_plugins==0', { 'sources/': [ - ['exclude', 'shell/shell_plugin_service_filter.cc'], - ['exclude', 'shell/shell_plugin_service_filter.h'], + ['exclude', 'shell/browser/shell_plugin_service_filter.cc'], + ['exclude', 'shell/browser/shell_plugin_service_filter.h'], ], }] ], diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index caa4c43..bcc4fc6 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc @@ -15,11 +15,16 @@ #include "content/public/renderer/render_view_observer.h" #include "content/public/test/test_utils.h" #include "content/renderer/savable_resources.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" +#include "third_party/WebKit/public/platform/WebCString.h" +#include "third_party/WebKit/public/platform/WebData.h" +#include "third_party/WebKit/public/platform/WebString.h" +#include "third_party/WebKit/public/platform/WebURL.h" +#include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebElement.h" #include "third_party/WebKit/public/web/WebFrame.h" @@ -29,11 +34,6 @@ #include "third_party/WebKit/public/web/WebPageSerializer.h" #include "third_party/WebKit/public/web/WebPageSerializerClient.h" #include "third_party/WebKit/public/web/WebView.h" -#include "third_party/WebKit/public/platform/WebCString.h" -#include "third_party/WebKit/public/platform/WebData.h" -#include "third_party/WebKit/public/platform/WebString.h" -#include "third_party/WebKit/public/platform/WebURL.h" -#include "third_party/WebKit/public/platform/WebVector.h" using WebKit::WebCString; using WebKit::WebData; diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 125f4c3..d6dae08 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc @@ -20,8 +20,8 @@ #include "content/public/renderer/navigation_state.h" #include "content/public/test/render_view_test.h" #include "content/renderer/render_view_impl.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_content_client.h" -#include "content/shell/shell_content_browser_client.h" #include "content/test/mock_keyboard.h" #include "net/base/net_errors.h" #include "net/cert/cert_status_flags.h" diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc index a96bbf5..573fe4d 100644 --- a/content/renderer/resource_fetcher_browsertest.cc +++ b/content/renderer/resource_fetcher_browsertest.cc @@ -13,7 +13,7 @@ #include "content/public/common/url_constants.h" #include "content/public/renderer/render_view.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "third_party/WebKit/public/platform/WebURLResponse.h" diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index 38c3c6c..a7ad83a 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc @@ -9,7 +9,7 @@ #include "content/public/common/content_switches.h" #include "content/public/renderer/render_view.h" #include "content/renderer/savable_resources.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test.h" #include "content/test/content_browser_test_utils.h" #include "net/base/net_util.h" diff --git a/content/shell/android/shell_jni_registrar.cc b/content/shell/android/shell_jni_registrar.cc index 504eda7..bd71354 100644 --- a/content/shell/android/shell_jni_registrar.cc +++ b/content/shell/android/shell_jni_registrar.cc @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "content/shell/android/shell_manager.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" namespace { diff --git a/content/shell/android/shell_manager.cc b/content/shell/android/shell_manager.cc index 08df6a4..9dbd46d 100644 --- a/content/shell/android/shell_manager.cc +++ b/content/shell/android/shell_manager.cc @@ -10,9 +10,9 @@ #include "base/bind.h" #include "base/lazy_instance.h" #include "content/public/browser/web_contents.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "jni/ShellManager_jni.h" #include "url/gurl.h" diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc index b5adadb..283f2d3 100644 --- a/content/shell/app/shell_main_delegate.cc +++ b/content/shell/app/shell_main_delegate.cc @@ -14,10 +14,10 @@ #include "content/public/common/url_constants.h" #include "content/public/test/layouttest_support.h" #include "content/shell/app/webkit_test_platform_support.h" +#include "content/shell/browser/shell_browser_main.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_switches.h" #include "content/shell/renderer/shell_content_renderer_client.h" -#include "content/shell/shell_browser_main.h" -#include "content/shell/shell_content_browser_client.h" #include "net/cookies/cookie_monster.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/content/shell/minimal_shell.cc b/content/shell/browser/minimal_shell.cc index 2e9079e..e7e88f8 100644 --- a/content/shell/minimal_shell.cc +++ b/content/shell/browser/minimal_shell.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/shell/minimal_shell.h" +#include "content/shell/browser/minimal_shell.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/focus_manager.h" diff --git a/content/shell/minimal_shell.h b/content/shell/browser/minimal_shell.h index b2ab9eb..1388da9 100644 --- a/content/shell/minimal_shell.h +++ b/content/shell/browser/minimal_shell.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_MINIMAL_SHELL_H_ -#define CONTENT_SHELL_MINIMAL_SHELL_H_ +#ifndef CONTENT_SHELL_BROWSER_MINIMAL_SHELL_H_ +#define CONTENT_SHELL_BROWSER_MINIMAL_SHELL_H_ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -64,4 +64,4 @@ class MinimalShell : public aura::client::StackingClient { } // namespace content; -#endif // CONTENT_SHELL_MINIMAL_SHELL_H_ +#endif // CONTENT_SHELL_BROWSER_MINIMAL_SHELL_H_ diff --git a/content/shell/notify_done_forwarder.cc b/content/shell/browser/notify_done_forwarder.cc index 522138e..6d8f104 100644 --- a/content/shell/notify_done_forwarder.cc +++ b/content/shell/browser/notify_done_forwarder.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/notify_done_forwarder.h" +#include "content/shell/browser/notify_done_forwarder.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_messages.h" -#include "content/shell/webkit_test_controller.h" namespace content { diff --git a/content/shell/notify_done_forwarder.h b/content/shell/browser/notify_done_forwarder.h index 008371a..e5a2f3f7 100644 --- a/content/shell/notify_done_forwarder.h +++ b/content/shell/browser/notify_done_forwarder.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_NOTIFY_DONE_FORWARDER_H_ -#define CONTENT_SHELL_NOTIFY_DONE_FORWARDER_H_ +#ifndef CONTENT_SHELL_BROWSER_NOTIFY_DONE_FORWARDER_H_ +#define CONTENT_SHELL_BROWSER_NOTIFY_DONE_FORWARDER_H_ #include "base/basictypes.h" #include "content/public/browser/web_contents_observer.h" @@ -31,4 +31,4 @@ class NotifyDoneForwarder : public WebContentsObserver, } // namespace content -#endif // CONTENT_SHELL_NOTIFY_DONE_FORWARDER_H_ +#endif // CONTENT_SHELL_BROWSER_NOTIFY_DONE_FORWARDER_H_ diff --git a/content/shell/shell.cc b/content/shell/browser/shell.cc index 93f13bf..c8616d3 100644 --- a/content/shell/shell.cc +++ b/content/shell/browser/shell.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "base/auto_reset.h" #include "base/command_line.h" @@ -23,14 +23,14 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" +#include "content/shell/browser/notify_done_forwarder.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_messages.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/notify_done_forwarder.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_javascript_dialog_manager.h" -#include "content/shell/webkit_test_controller.h" namespace content { diff --git a/content/shell/shell.h b/content/shell/browser/shell.h index 8666aec..24c58c8 100644 --- a/content/shell/shell.h +++ b/content/shell/browser/shell.h @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_H_ -#define CONTENT_SHELL_SHELL_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_H_ +#define CONTENT_SHELL_BROWSER_SHELL_H_ #include <vector> @@ -283,4 +283,4 @@ class Shell : public WebContentsDelegate, } // namespace content -#endif // CONTENT_SHELL_SHELL_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_H_ diff --git a/content/shell/shell_android.cc b/content/shell/browser/shell_android.cc index d12d0d7..d827e96 100644 --- a/content/shell/shell_android.cc +++ b/content/shell/browser/shell_android.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include <jni.h> diff --git a/content/shell/shell_application_mac.h b/content/shell/browser/shell_application_mac.h index 26718ac..bcba5a5 100644 --- a/content/shell/shell_application_mac.h +++ b/content/shell/browser/shell_application_mac.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ -#define CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_APPLICATION_MAC_H_ +#define CONTENT_SHELL_BROWSER_SHELL_APPLICATION_MAC_H_ #include "base/mac/scoped_sending_event.h" #include "base/message_loop/message_pump_mac.h" @@ -24,4 +24,4 @@ @end -#endif // CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_APPLICATION_MAC_H_ diff --git a/content/shell/shell_application_mac.mm b/content/shell/browser/shell_application_mac.mm index 8300ebf..e18df5b 100644 --- a/content/shell/shell_application_mac.mm +++ b/content/shell/browser/shell_application_mac.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_application_mac.h" +#include "content/shell/browser/shell_application_mac.h" #include "base/auto_reset.h" #include "content/public/common/url_constants.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "url/gurl.h" @implementation ShellCrApplication diff --git a/content/shell/shell_aura.cc b/content/shell/browser/shell_aura.cc index b7bf5d0..03884da 100644 --- a/content/shell/shell_aura.cc +++ b/content/shell/browser/shell_aura.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" @@ -30,7 +30,7 @@ #if defined(OS_CHROMEOS) #include "chromeos/dbus/dbus_thread_manager.h" -#include "content/shell/minimal_shell.h" +#include "content/shell/browser/minimal_shell.h" #include "ui/aura/test/test_screen.h" #endif diff --git a/content/shell/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc index 1c89355..c6dbb99 100644 --- a/content/shell/shell_browser_context.cc +++ b/content/shell/browser/shell_browser_context.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_browser_context.h" +#include "content/shell/browser/shell_browser_context.h" #include "base/bind.h" #include "base/command_line.h" @@ -15,9 +15,9 @@ #include "content/public/browser/resource_context.h" #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" +#include "content/shell/browser/shell_download_manager_delegate.h" +#include "content/shell/browser/shell_url_request_context_getter.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_download_manager_delegate.h" -#include "content/shell/shell_url_request_context_getter.h" #if defined(OS_WIN) #include "base/base_paths_win.h" diff --git a/content/shell/shell_browser_context.h b/content/shell/browser/shell_browser_context.h index 640f237..ec71591 100644 --- a/content/shell/shell_browser_context.h +++ b/content/shell/browser/shell_browser_context.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_ -#define CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ +#define CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ #include "base/compiler_specific.h" #include "base/files/file_path.h" @@ -80,4 +80,4 @@ class ShellBrowserContext : public BrowserContext { } // namespace content -#endif // CONTENT_SHELL_SHELL_BROWSER_CONTEXT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_CONTEXT_H_ diff --git a/content/shell/shell_browser_main.cc b/content/shell/browser/shell_browser_main.cc index a267fe2..ac520d6 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/browser/shell_browser_main.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_browser_main.h" +#include "content/shell/browser/shell_browser_main.h" #include <iostream> @@ -17,16 +17,16 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_main_runner.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" -#include "content/shell/shell.h" -#include "content/shell/webkit_test_controller.h" #include "net/base/net_util.h" #include "webkit/support/webkit_support.h" #if defined(OS_ANDROID) #include "base/run_loop.h" -#include "content/shell/shell_layout_tests_android.h" +#include "content/shell/browser/shell_layout_tests_android.h" #endif namespace { diff --git a/content/shell/shell_browser_main.h b/content/shell/browser/shell_browser_main.h index 7fe5908..d361fa3 100644 --- a/content/shell/shell_browser_main.h +++ b/content/shell/browser/shell_browser_main.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_BROWSER_MAIN_H_ -#define CONTENT_SHELL_SHELL_BROWSER_MAIN_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_H_ +#define CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_H_ #include "base/memory/scoped_ptr.h" @@ -16,4 +16,4 @@ int ShellBrowserMain( const content::MainFunctionParams& parameters, const scoped_ptr<content::BrowserMainRunner>& main_runner); -#endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_H_ diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc index bf7233a..6f7da00 100644 --- a/content/shell/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_browser_main_parts.h" +#include "content/shell/browser/shell_browser_main_parts.h" #include "base/bind.h" #include "base/command_line.h" @@ -16,11 +16,11 @@ #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/url_constants.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_devtools_delegate.h" +#include "content/shell/browser/shell_net_log.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_devtools_delegate.h" -#include "content/shell/shell_net_log.h" #include "grit/net_resources.h" #include "net/base/net_module.h" #include "net/base/net_util.h" @@ -30,7 +30,7 @@ #if defined(ENABLE_PLUGINS) #include "content/public/browser/plugin_service.h" -#include "content/shell/shell_plugin_service_filter.h" +#include "content/shell/browser/shell_plugin_service_filter.h" #endif #if defined(OS_ANDROID) diff --git a/content/shell/shell_browser_main_parts.h b/content/shell/browser/shell_browser_main_parts.h index 25a4449..990e1c5 100644 --- a/content/shell/shell_browser_main_parts.h +++ b/content/shell/browser/shell_browser_main_parts.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ -#define CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ +#define CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" @@ -67,4 +67,4 @@ class ShellBrowserMainParts : public BrowserMainParts { } // namespace content -#endif // CONTENT_SHELL_SHELL_BROWSER_MAIN_PARTS_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_BROWSER_MAIN_PARTS_H_ diff --git a/content/shell/shell_browser_main_parts_mac.mm b/content/shell/browser/shell_browser_main_parts_mac.mm index b2b84b7..a933705 100644 --- a/content/shell/shell_browser_main_parts_mac.mm +++ b/content/shell/browser/shell_browser_main_parts_mac.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_browser_main_parts.h" +#include "content/shell/browser/shell_browser_main_parts.h" #import <Cocoa/Cocoa.h> #include "base/mac/bundle_locations.h" #include "base/mac/scoped_nsobject.h" -#include "content/shell/shell_application_mac.h" +#include "content/shell/browser/shell_application_mac.h" namespace content { diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc index ac37954..715eafd 100644 --- a/content/shell/shell_content_browser_client.cc +++ b/content/shell/browser/shell_content_browser_client.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "base/command_line.h" #include "base/file_util.h" @@ -14,20 +14,20 @@ #include "content/public/browser/storage_partition.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_devtools_delegate.h" +#include "content/shell/browser/shell_message_filter.h" +#include "content/shell/browser/shell_net_log.h" +#include "content/shell/browser/shell_quota_permission_context.h" +#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_messages.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" #include "content/shell/geolocation/shell_access_token_store.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_devtools_delegate.h" -#include "content/shell/shell_message_filter.h" -#include "content/shell/shell_net_log.h" -#include "content/shell/shell_quota_permission_context.h" -#include "content/shell/shell_resource_dispatcher_host_delegate.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" -#include "content/shell/webkit_test_controller.h" #include "net/url_request/url_request_context_getter.h" #include "url/gurl.h" #include "webkit/common/webpreferences.h" diff --git a/content/shell/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h index 917a955..15285ca 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/browser/shell_content_browser_client.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ -#define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ +#define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ #include <string> @@ -100,4 +100,4 @@ class ShellContentBrowserClient : public ContentBrowserClient, } // namespace content -#endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ diff --git a/content/shell/shell_devtools_delegate.cc b/content/shell/browser/shell_devtools_delegate.cc index d6fe39c..0a01405 100644 --- a/content/shell/shell_devtools_delegate.cc +++ b/content/shell/browser/shell_devtools_delegate.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_devtools_delegate.h" +#include "content/shell/browser/shell_devtools_delegate.h" #include <vector> @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "grit/shell_resources.h" #include "net/socket/tcp_listen_socket.h" #include "ui/base/resource/resource_bundle.h" diff --git a/content/shell/shell_devtools_delegate.h b/content/shell/browser/shell_devtools_delegate.h index dd4e762..a218738 100644 --- a/content/shell/shell_devtools_delegate.h +++ b/content/shell/browser/shell_devtools_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_DEVTOOLS_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_DEVTOOLS_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -47,4 +47,4 @@ class ShellDevToolsDelegate : public DevToolsHttpHandlerDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_DEVTOOLS_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_DELEGATE_H_ diff --git a/content/shell/shell_devtools_frontend.cc b/content/shell/browser/shell_devtools_frontend.cc index d102eaa..8c3f74b 100644 --- a/content/shell/shell_devtools_frontend.cc +++ b/content/shell/browser/shell_devtools_frontend.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_devtools_frontend.h" +#include "content/shell/browser/shell_devtools_frontend.h" #include "base/command_line.h" #include "base/path_service.h" @@ -11,12 +11,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/content_client.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_delegate.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_delegate.h" #include "net/base/net_util.h" namespace content { diff --git a/content/shell/shell_devtools_frontend.h b/content/shell/browser/shell_devtools_frontend.h index a76cbc3..b6a617f 100644 --- a/content/shell/shell_devtools_frontend.h +++ b/content/shell/browser/shell_devtools_frontend.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_DEVTOOLS_FRONTEND_H_ -#define CONTENT_SHELL_SHELL_DEVTOOLS_FRONTEND_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_FRONTEND_H_ +#define CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_FRONTEND_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -70,4 +70,4 @@ class ShellDevToolsFrontend : public WebContentsObserver, } // namespace content -#endif // CONTENT_SHELL_SHELL_DEVTOOLS_FRONTEND_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_DEVTOOLS_FRONTEND_H_ diff --git a/content/shell/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc index 624ece5..1dbbea7 100644 --- a/content/shell/shell_download_manager_delegate.cc +++ b/content/shell/browser/shell_download_manager_delegate.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_download_manager_delegate.h" +#include "content/shell/browser/shell_download_manager_delegate.h" #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> @@ -24,8 +24,8 @@ #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/webkit_test_controller.h" #include "net/base/net_util.h" namespace content { diff --git a/content/shell/shell_download_manager_delegate.h b/content/shell/browser/shell_download_manager_delegate.h index 3c699c5..afd57e7 100644 --- a/content/shell/shell_download_manager_delegate.h +++ b/content/shell/browser/shell_download_manager_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" @@ -62,4 +62,4 @@ class ShellDownloadManagerDelegate } // namespace content -#endif // CONTENT_SHELL_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_DOWNLOAD_MANAGER_DELEGATE_H_ diff --git a/content/shell/shell_gtk.cc b/content/shell/browser/shell_gtk.cc index ee77473..a06a6a0 100644 --- a/content/shell/shell_gtk.cc +++ b/content/shell/browser/shell_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> @@ -15,8 +15,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" namespace content { diff --git a/content/shell/shell_javascript_dialog.h b/content/shell/browser/shell_javascript_dialog.h index b819f3b..4001334 100644 --- a/content/shell/shell_javascript_dialog.h +++ b/content/shell/browser/shell_javascript_dialog.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_ -#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ +#define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ #include "content/public/browser/javascript_dialog_manager.h" @@ -61,4 +61,4 @@ class ShellJavaScriptDialog { } // namespace content -#endif // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ diff --git a/content/shell/shell_javascript_dialog_gtk.cc b/content/shell/browser/shell_javascript_dialog_gtk.cc index 9ba05fc..87bd6f3 100644 --- a/content/shell/shell_javascript_dialog_gtk.cc +++ b/content/shell/browser/shell_javascript_dialog_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_javascript_dialog.h" +#include "content/shell/browser/shell_javascript_dialog.h" #include <gtk/gtk.h> @@ -10,8 +10,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "content/shell/app/resource.h" -#include "content/shell/shell.h" -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" namespace { diff --git a/content/shell/shell_javascript_dialog_mac.mm b/content/shell/browser/shell_javascript_dialog_mac.mm index 0a89a89..fe9de98 100644 --- a/content/shell/shell_javascript_dialog_mac.mm +++ b/content/shell/browser/shell_javascript_dialog_mac.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_javascript_dialog.h" +#include "content/shell/browser/shell_javascript_dialog.h" #import <Cocoa/Cocoa.h> #import "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" // Helper object that receives the notification that the dialog/sheet is // going away. Is responsible for cleaning itself up. diff --git a/content/shell/shell_javascript_dialog_manager.cc b/content/shell/browser/shell_javascript_dialog_manager.cc index 9248483..1476f7c 100644 --- a/content/shell/shell_javascript_dialog_manager.cc +++ b/content/shell/browser/shell_javascript_dialog_manager.cc @@ -1,17 +1,17 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" #include "base/command_line.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "content/shell/browser/shell_javascript_dialog.h" +#include "content/shell/browser/webkit_test_controller.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_javascript_dialog.h" -#include "content/shell/webkit_test_controller.h" #include "net/base/net_util.h" namespace content { diff --git a/content/shell/shell_javascript_dialog_manager.h b/content/shell/browser/shell_javascript_dialog_manager.h index 1327ab7..763736f 100644 --- a/content/shell/shell_javascript_dialog_manager.h +++ b/content/shell/browser/shell_javascript_dialog_manager.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ -#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ #include "base/callback_forward.h" #include "base/compiler_specific.h" @@ -64,4 +64,4 @@ class ShellJavaScriptDialogManager : public JavaScriptDialogManager { } // namespace content -#endif // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_ diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/browser/shell_javascript_dialog_win.cc index c39b2d7..a59639e 100644 --- a/content/shell/shell_javascript_dialog_win.cc +++ b/content/shell/browser/shell_javascript_dialog_win.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_javascript_dialog.h" +#include "content/shell/browser/shell_javascript_dialog.h" #include "base/strings/string_util.h" #include "content/shell/app/resource.h" -#include "content/shell/shell.h" -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" namespace content { diff --git a/content/shell/shell_layout_tests_android.cc b/content/shell/browser/shell_layout_tests_android.cc index 68e8001..de94b8c 100644 --- a/content/shell/shell_layout_tests_android.cc +++ b/content/shell/browser/shell_layout_tests_android.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/shell/shell_layout_tests_android.h" +#include "content/shell/browser/shell_layout_tests_android.h" #include "base/android/fifo_utils.h" #include "base/android/jni_android.h" diff --git a/content/shell/shell_layout_tests_android.h b/content/shell/browser/shell_layout_tests_android.h index 9a3c423..7410954 100644 --- a/content/shell/shell_layout_tests_android.h +++ b/content/shell/browser/shell_layout_tests_android.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_LAYOUT_TESTS_ANDROID_H_ -#define CONTENT_SHELL_SHELL_LAYOUT_TESTS_ANDROID_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ +#define CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ #include <string> @@ -22,4 +22,4 @@ void EnsureInitializeForAndroidLayoutTests(); } // namespace content -#endif // CONTENT_SHELL_SHELL_LAYOUT_TESTS_ANDROID_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_LAYOUT_TESTS_ANDROID_H_ diff --git a/content/shell/shell_login_dialog.cc b/content/shell/browser/shell_login_dialog.cc index f32c427..f1639e9 100644 --- a/content/shell/shell_login_dialog.cc +++ b/content/shell/browser/shell_login_dialog.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_login_dialog.h" +#include "content/shell/browser/shell_login_dialog.h" #include "base/bind.h" #include "base/logging.h" diff --git a/content/shell/shell_login_dialog.h b/content/shell/browser/shell_login_dialog.h index 22abab4..d9b0504 100644 --- a/content/shell/shell_login_dialog.h +++ b/content/shell/browser/shell_login_dialog.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_LOGIN_DIALOG_H_ -#define CONTENT_SHELL_SHELL_LOGIN_DIALOG_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_LOGIN_DIALOG_H_ +#define CONTENT_SHELL_BROWSER_SHELL_LOGIN_DIALOG_H_ #include "base/compiler_specific.h" #include "base/strings/string16.h" @@ -94,4 +94,4 @@ class ShellLoginDialog : public ResourceDispatcherHostLoginDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_LOGIN_DIALOG_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_LOGIN_DIALOG_H_ diff --git a/content/shell/shell_login_dialog_gtk.cc b/content/shell/browser/shell_login_dialog_gtk.cc index 1be48d3..b08b449 100644 --- a/content/shell/shell_login_dialog_gtk.cc +++ b/content/shell/browser/shell_login_dialog_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_login_dialog.h" +#include "content/shell/browser/shell_login_dialog.h" #include <gtk/gtk.h> diff --git a/content/shell/shell_login_dialog_mac.mm b/content/shell/browser/shell_login_dialog_mac.mm index b7d6947..447aa58 100644 --- a/content/shell/shell_login_dialog_mac.mm +++ b/content/shell/browser/shell_login_dialog_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_login_dialog.h" +#include "content/shell/browser/shell_login_dialog.h" #import <Cocoa/Cocoa.h> diff --git a/content/shell/shell_mac.mm b/content/shell/browser/shell_mac.mm index 370a64d..ca6a0ff 100644 --- a/content/shell/shell_mac.mm +++ b/content/shell/browser/shell_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include <algorithm> diff --git a/content/shell/shell_message_filter.cc b/content/shell/browser/shell_message_filter.cc index 7bfe8267..c7c4cca 100644 --- a/content/shell/shell_message_filter.cc +++ b/content/shell/browser/shell_message_filter.cc @@ -1,16 +1,16 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_message_filter.h" +#include "content/shell/browser/shell_message_filter.h" #include "base/file_util.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/child_process_security_policy.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_network_delegate.h" #include "content/shell/common/shell_messages.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_network_delegate.h" #include "net/base/net_errors.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" diff --git a/content/shell/shell_message_filter.h b/content/shell/browser/shell_message_filter.h index b53908e..135a915 100644 --- a/content/shell/shell_message_filter.h +++ b/content/shell/browser/shell_message_filter.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_MESSAGE_FILTER_H_ -#define CONTENT_SHELL_SHELL_MESSAGE_FILTER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_MESSAGE_FILTER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_MESSAGE_FILTER_H_ #include <string> #include <vector> @@ -63,4 +63,4 @@ class ShellMessageFilter : public BrowserMessageFilter { } // namespace content -#endif // CONTENT_SHELL_SHELL_MESSAGE_FILTER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_MESSAGE_FILTER_H_ diff --git a/content/shell/shell_net_log.cc b/content/shell/browser/shell_net_log.cc index 03443d2..97276d6 100644 --- a/content/shell/shell_net_log.cc +++ b/content/shell/browser/shell_net_log.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/shell/shell_net_log.h" +#include "content/shell/browser/shell_net_log.h" #include <stdio.h> diff --git a/content/shell/shell_net_log.h b/content/shell/browser/shell_net_log.h index ead9108..9846917 100644 --- a/content/shell/shell_net_log.h +++ b/content/shell/browser/shell_net_log.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ -#define CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_ +#define CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_ #include <string> @@ -25,4 +25,4 @@ class ShellNetLog : public net::NetLog { } // namespace content -#endif // CONTENT_SHELL_SHELL_CONTENT_BROWSER_CLIENT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_ diff --git a/content/shell/shell_network_delegate.cc b/content/shell/browser/shell_network_delegate.cc index e633686e..560426f 100644 --- a/content/shell/shell_network_delegate.cc +++ b/content/shell/browser/shell_network_delegate.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_network_delegate.h" +#include "content/shell/browser/shell_network_delegate.h" #include "net/base/net_errors.h" #include "net/base/static_cookie_policy.h" diff --git a/content/shell/shell_network_delegate.h b/content/shell/browser/shell_network_delegate.h index c2f5e8e..a3ce0a2 100644 --- a/content/shell/shell_network_delegate.h +++ b/content/shell/browser/shell_network_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_NETWORK_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_NETWORK_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_NETWORK_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_NETWORK_DELEGATE_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -68,4 +68,4 @@ class ShellNetworkDelegate : public net::NetworkDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_NETWORK_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_NETWORK_DELEGATE_H_ diff --git a/content/shell/shell_plugin_service_filter.cc b/content/shell/browser/shell_plugin_service_filter.cc index f164637..d41b9bd 100644 --- a/content/shell/shell_plugin_service_filter.cc +++ b/content/shell/browser/shell_plugin_service_filter.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_plugin_service_filter.h" +#include "content/shell/browser/shell_plugin_service_filter.h" #include "base/strings/utf_string_conversions.h" #include "content/public/common/webplugininfo.h" diff --git a/content/shell/shell_plugin_service_filter.h b/content/shell/browser/shell_plugin_service_filter.h index a489aff..3e9cb5d 100644 --- a/content/shell/shell_plugin_service_filter.h +++ b/content/shell/browser/shell_plugin_service_filter.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_PLUGIN_SERVICE_FILTER_H_ -#define CONTENT_SHELL_SHELL_PLUGIN_SERVICE_FILTER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_PLUGIN_SERVICE_FILTER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_PLUGIN_SERVICE_FILTER_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -34,4 +34,4 @@ class ShellPluginServiceFilter : public PluginServiceFilter { } // namespace content -#endif // CONTENT_SHELL_SHELL_PLUGIN_SERVICE_FILTER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_PLUGIN_SERVICE_FILTER_H_ diff --git a/content/shell/shell_quota_permission_context.cc b/content/shell/browser/shell_quota_permission_context.cc index fe0df90..064322f 100644 --- a/content/shell/shell_quota_permission_context.cc +++ b/content/shell/browser/shell_quota_permission_context.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_quota_permission_context.h" +#include "content/shell/browser/shell_quota_permission_context.h" #include "webkit/common/quota/quota_types.h" diff --git a/content/shell/shell_quota_permission_context.h b/content/shell/browser/shell_quota_permission_context.h index af7f62f..381338d 100644 --- a/content/shell/shell_quota_permission_context.h +++ b/content/shell/browser/shell_quota_permission_context.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_QUOTA_PERMISSION_CONTEXT_H_ -#define CONTENT_SHELL_SHELL_QUOTA_PERMISSION_CONTEXT_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_QUOTA_PERMISSION_CONTEXT_H_ +#define CONTENT_SHELL_BROWSER_SHELL_QUOTA_PERMISSION_CONTEXT_H_ #include "base/compiler_specific.h" #include "content/public/browser/quota_permission_context.h" @@ -31,4 +31,4 @@ class ShellQuotaPermissionContext : public QuotaPermissionContext { } // namespace content -#endif // CONTENT_SHELL_SHELL_QUOTA_PERMISSION_CONTEXT_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_QUOTA_PERMISSION_CONTEXT_H_ diff --git a/content/shell/shell_resource_dispatcher_host_delegate.cc b/content/shell/browser/shell_resource_dispatcher_host_delegate.cc index 1637edd..d0994b1 100644 --- a/content/shell/shell_resource_dispatcher_host_delegate.cc +++ b/content/shell/browser/shell_resource_dispatcher_host_delegate.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_resource_dispatcher_host_delegate.h" +#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" #include "base/command_line.h" +#include "content/shell/browser/shell_login_dialog.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_login_dialog.h" namespace content { diff --git a/content/shell/shell_resource_dispatcher_host_delegate.h b/content/shell/browser/shell_resource_dispatcher_host_delegate.h index ff78e48..90e6d4c 100644 --- a/content/shell/shell_resource_dispatcher_host_delegate.h +++ b/content/shell/browser/shell_resource_dispatcher_host_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ #include "base/callback.h" #include "base/compiler_specific.h" @@ -37,4 +37,4 @@ class ShellResourceDispatcherHostDelegate } // namespace content -#endif // CONTENT_SHELL_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_RESOURCE_DISPATCHER_HOST_DELEGATE_H_ diff --git a/content/shell/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc index 969ba3d..dfdb852 100644 --- a/content/shell/shell_url_request_context_getter.cc +++ b/content/shell/browser/shell_url_request_context_getter.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_url_request_context_getter.h" +#include "content/shell/browser/shell_url_request_context_getter.h" #include "base/command_line.h" #include "base/logging.h" @@ -14,8 +14,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" +#include "content/shell/browser/shell_network_delegate.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_network_delegate.h" #include "net/base/cache_type.h" #include "net/cert/cert_verifier.h" #include "net/cookies/cookie_monster.h" diff --git a/content/shell/shell_url_request_context_getter.h b/content/shell/browser/shell_url_request_context_getter.h index d1afb6f..b18c0a9 100644 --- a/content/shell/shell_url_request_context_getter.h +++ b/content/shell/browser/shell_url_request_context_getter.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ -#define CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ +#define CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ #include "base/compiler_specific.h" #include "base/files/file_path.h" @@ -66,4 +66,4 @@ class ShellURLRequestContextGetter : public net::URLRequestContextGetter { } // namespace content -#endif // CONTENT_SHELL_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_URL_REQUEST_CONTEXT_GETTER_H_ diff --git a/content/shell/shell_web_contents_view_delegate.h b/content/shell/browser/shell_web_contents_view_delegate.h index f9292a8..86d97b4 100644 --- a/content/shell/shell_web_contents_view_delegate.h +++ b/content/shell/browser/shell_web_contents_view_delegate.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ -#define CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ +#define CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view_delegate.h" @@ -80,4 +80,4 @@ class ShellWebContentsViewDelegate : public WebContentsViewDelegate { } // namespace content -#endif // CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ +#endif // CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_H_ diff --git a/content/shell/shell_web_contents_view_delegate_android.cc b/content/shell/browser/shell_web_contents_view_delegate_android.cc index a5b4c82..3da5475 100644 --- a/content/shell/shell_web_contents_view_delegate_android.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_android.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #include "base/command_line.h" #include "content/public/browser/android/content_view_core.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" namespace content { diff --git a/content/shell/shell_web_contents_view_delegate_creator.h b/content/shell/browser/shell_web_contents_view_delegate_creator.h index 707bbd9..819ce1e 100644 --- a/content/shell/shell_web_contents_view_delegate_creator.h +++ b/content/shell/browser/shell_web_contents_view_delegate_creator.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ -#define CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ +#ifndef CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ +#define CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ namespace content { @@ -15,4 +15,4 @@ WebContentsViewDelegate* CreateShellWebContentsViewDelegate( } // namespace content -#endif //CONTENT_SHELL_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ +#endif //CONTENT_SHELL_BROWSER_SHELL_WEB_CONTENTS_VIEW_DELEGATE_CREATOR_H_ diff --git a/content/shell/shell_web_contents_view_delegate_gtk.cc b/content/shell/browser/shell_web_contents_view_delegate_gtk.cc index 9f1318b..4c98257 100644 --- a/content/shell/shell_web_contents_view_delegate_gtk.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_gtk.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #include "base/command_line.h" #include "content/public/browser/render_process_host.h" @@ -11,13 +11,13 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" #include "ui/base/gtk/focus_store_gtk.h" #include "ui/base/gtk/gtk_floating_container.h" diff --git a/content/shell/shell_web_contents_view_delegate_mac.mm b/content/shell/browser/shell_web_contents_view_delegate_mac.mm index 606a826..00196af 100644 --- a/content/shell/shell_web_contents_view_delegate_mac.mm +++ b/content/shell/browser/shell_web_contents_view_delegate_mac.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #import <Cocoa/Cocoa.h> @@ -13,13 +13,13 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" using WebKit::WebContextMenuData; diff --git a/content/shell/shell_web_contents_view_delegate_win.cc b/content/shell/browser/shell_web_contents_view_delegate_win.cc index a062dea..cd387f0 100644 --- a/content/shell/shell_web_contents_view_delegate_win.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell_web_contents_view_delegate.h" +#include "content/shell/browser/shell_web_contents_view_delegate.h" #include "base/command_line.h" #include "content/public/browser/render_process_host.h" @@ -11,13 +11,13 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/context_menu_params.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_browser_main_parts.h" +#include "content/shell/browser/shell_content_browser_client.h" +#include "content/shell/browser/shell_devtools_frontend.h" +#include "content/shell/browser/shell_web_contents_view_delegate_creator.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_browser_main_parts.h" -#include "content/shell/shell_content_browser_client.h" -#include "content/shell/shell_devtools_frontend.h" -#include "content/shell/shell_web_contents_view_delegate_creator.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" using WebKit::WebContextMenuData; diff --git a/content/shell/shell_win.cc b/content/shell/browser/shell_win.cc index d6d9497..d1bb402 100644 --- a/content/shell/shell_win.cc +++ b/content/shell/browser/shell_win.cc @@ -1,13 +1,13 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" +#include <windows.h> #include <commctrl.h> #include <fcntl.h> #include <io.h> -#include <windows.h> #include "base/strings/utf_string_conversions.h" #include "base/win/wrapped_window_proc.h" diff --git a/content/shell/webkit_test_controller.cc b/content/shell/browser/webkit_test_controller.cc index 147367e..40ed9c5 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/browser/webkit_test_controller.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/shell/webkit_test_controller.h" +#include "content/shell/browser/webkit_test_controller.h" #include <iostream> @@ -24,12 +24,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/content_switches.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_messages.h" #include "content/shell/common/shell_switches.h" #include "content/shell/common/webkit_test_helpers.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" #include "ui/gfx/codec/png_codec.h" namespace content { diff --git a/content/shell/webkit_test_controller.h b/content/shell/browser/webkit_test_controller.h index aa181df..58d1fa9 100644 --- a/content/shell/webkit_test_controller.h +++ b/content/shell/browser/webkit_test_controller.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ -#define CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ +#ifndef CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ +#define CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ #include <ostream> #include <string> @@ -216,4 +216,4 @@ class WebKitTestController : public base::NonThreadSafe, } // namespace content -#endif // CONTENT_SHELL_WEBKIT_TEST_CONTROLLER_H_ +#endif // CONTENT_SHELL_BROWSER_WEBKIT_TEST_CONTROLLER_H_ diff --git a/content/shell/geolocation/shell_access_token_store.cc b/content/shell/geolocation/shell_access_token_store.cc index fa889bd..ceae3d6 100644 --- a/content/shell/geolocation/shell_access_token_store.cc +++ b/content/shell/geolocation/shell_access_token_store.cc @@ -8,7 +8,7 @@ #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_thread.h" -#include "content/shell/shell_browser_context.h" +#include "content/shell/browser/shell_browser_context.h" namespace content { diff --git a/content/test/accessibility_browser_test_utils.cc b/content/test/accessibility_browser_test_utils.cc index 5ca6b12..08534eb 100644 --- a/content/test/accessibility_browser_test_utils.cc +++ b/content/test/accessibility_browser_test_utils.cc @@ -13,7 +13,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" namespace content { diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index fb0cb6d..2155cb3 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -14,11 +14,11 @@ #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/shell/app/shell_main_delegate.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_browser_context.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_switches.h" #include "content/shell/renderer/shell_content_renderer_client.h" -#include "content/shell/shell.h" -#include "content/shell/shell_browser_context.h" -#include "content/shell/shell_content_browser_client.h" #include "content/test/test_content_client.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/content/test/content_browser_test_test.cc b/content/test/content_browser_test_test.cc index 9ecd4f6..5681140 100644 --- a/content/test/content_browser_test_test.cc +++ b/content/test/content_browser_test_test.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" -#include "content/shell/shell.h" +#include "content/shell/browser/shell.h" #include "content/test/content_browser_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/test/content_browser_test_utils.cc b/content/test/content_browser_test_utils.cc index aec5661..6c387184 100644 --- a/content/test/content_browser_test_utils.cc +++ b/content/test/content_browser_test_utils.cc @@ -15,8 +15,8 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" -#include "content/shell/shell.h" -#include "content/shell/shell_javascript_dialog_manager.h" +#include "content/shell/browser/shell.h" +#include "content/shell/browser/shell_javascript_dialog_manager.h" #include "net/base/net_util.h" namespace content { diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc index c4ed185..9a229a9 100644 --- a/content/test/content_test_launcher.cc +++ b/content/test/content_test_launcher.cc @@ -12,9 +12,9 @@ #include "content/public/common/content_switches.h" #include "content/public/test/content_test_suite_base.h" #include "content/shell/app/shell_main_delegate.h" +#include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/common/shell_content_client.h" #include "content/shell/common/shell_switches.h" -#include "content/shell/shell_content_browser_client.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_ANDROID) diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc index d357e76..2cea5ef 100644 --- a/ui/views/examples/content_client/examples_browser_main_parts.cc +++ b/ui/views/examples/content_client/examples_browser_main_parts.cc @@ -12,7 +12,7 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "content/public/common/content_switches.h" -#include "content/shell/shell_browser_context.h" +#include "content/shell/browser/shell_browser_context.h" #include "ui/views/examples/examples_window_with_content.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/test/desktop_test_views_delegate.h" |