Index: content/content_shell.gypi |
diff --git a/content/content_shell.gypi b/content/content_shell.gypi |
index 10cb53a22768b0fc3117986898fc709b30b87807..e6e5b6aaf1463f1b40d544917e8def239d17218e 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'], |
], |
}] |
], |