diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 06:06:12 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-17 06:06:12 +0000 |
| commit | 4dd5793c22cc4e9991055adcb4e7163fbba8c246 (patch) | |
| tree | fb2307f59725643e4c4ce8d4f215188fd8920bdd /chrome | |
| parent | 7e06cb9f6a1bfd890eebd08195a903a58912cdc9 (diff) | |
| download | chromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.zip chromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.tar.gz chromium_src-4dd5793c22cc4e9991055adcb4e7163fbba8c246.tar.bz2 | |
Move the remaining files in chrome\common to content\common.
TBR=avi
Review URL: http://codereview.chromium.org/6672070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
135 files changed, 119 insertions, 1591 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc index dfff428..11dbdde 100644 --- a/chrome/app/breakpad_win.cc +++ b/chrome/app/breakpad_win.cc @@ -27,10 +27,10 @@ #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" -#include "chrome/common/result_codes.h" #include "chrome/installer/util/google_chrome_sxs_distribution.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/install_util.h" +#include "content/common/result_codes.h" #include "policy/policy_constants.h" namespace { diff --git a/chrome/app/chrome_exe_main_win.cc b/chrome/app/chrome_exe_main_win.cc index 296431c..28c0da4 100644 --- a/chrome/app/chrome_exe_main_win.cc +++ b/chrome/app/chrome_exe_main_win.cc @@ -10,7 +10,7 @@ #include "base/win/windows_version.h" #include "chrome/app/breakpad_win.h" #include "chrome/app/client_util.h" -#include "chrome/common/result_codes.h" +#include "content/common/result_codes.h" #include "sandbox/src/dep.h" #include "sandbox/src/sandbox_factory.h" diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 2252546..400c637 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -33,13 +33,13 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/profiling.h" -#include "chrome/common/set_process_title.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/common/content_client.h" #include "content/common/content_paths.h" #include "content/common/main_function_params.h" #include "content/common/sandbox_init_wrapper.h" +#include "content/common/set_process_title.h" #include "ipc/ipc_switches.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 174d62d..38d5d11 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -19,12 +19,12 @@ #include "chrome/app/client_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/result_codes.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/util_constants.h" +#include "content/common/result_codes.h" namespace { // The entry point signature of chrome.dll. diff --git a/chrome/app/dummy_main_functions.cc b/chrome/app/dummy_main_functions.cc index bb0b5e5..bc942f6 100644 --- a/chrome/app/dummy_main_functions.cc +++ b/chrome/app/dummy_main_functions.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/result_codes.h" #include "content/common/main_function_params.h" +#include "content/common/result_codes.h" // Native Client binary for 64-bit Windows can run only the NaCl loader or // the sandbox broker processes. Other process types are not supported. diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h index 7bb0dc0..e830902 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.h +++ b/chrome/browser/autocomplete/autocomplete_edit.h @@ -11,7 +11,7 @@ #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/common/instant_types.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view.h b/chrome/browser/autocomplete/autocomplete_edit_view.h index 99951f8..2054699 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view.h @@ -15,7 +15,7 @@ #include <string> #include "base/string16.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "ui/gfx/native_widget_types.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h index cc8bbd6..60d83c3 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h @@ -17,9 +17,9 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" -#include "chrome/common/page_transition_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "content/common/page_transition_types.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/gtk_signal_registrar.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.h b/chrome/browser/autocomplete/autocomplete_edit_view_views.h index 3c66c8c..4f32ed9 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_views.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.h @@ -12,8 +12,8 @@ #include "base/scoped_ptr.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" -#include "chrome/common/page_transition_types.h" #include "content/common/notification_observer.h" +#include "content/common/page_transition_types.h" #include "ui/base/range/range.h" #include "views/controls/textfield/textfield_controller.h" #include "views/view.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index 8a29b84..3b9e49b 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -19,7 +19,7 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/font.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/autocomplete/autocomplete_match.h b/chrome/browser/autocomplete/autocomplete_match.h index 49d9fbb..a376062 100644 --- a/chrome/browser/autocomplete/autocomplete_match.h +++ b/chrome/browser/autocomplete/autocomplete_match.h @@ -9,7 +9,7 @@ #include <vector> #include <string> -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" class AutocompleteProvider; diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc index c213509..9047ed7 100644 --- a/chrome/browser/automation/automation_provider_win.cc +++ b/chrome/browser/automation/automation_provider_win.cc @@ -21,9 +21,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/common/automation_messages.h" -#include "chrome/common/page_zoom.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/page_zoom.h" #include "ui/base/keycodes/keyboard_codes.h" #include "views/focus/accelerator_handler.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h index 02dfda2..762f9c0 100644 --- a/chrome/browser/automation/testing_automation_provider.h +++ b/chrome/browser/automation/testing_automation_provider.h @@ -13,8 +13,8 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/importer/importer_list.h" #include "chrome/browser/sync/profile_sync_service_harness.h" -#include "chrome/common/page_type.h" #include "content/common/notification_registrar.h" +#include "content/common/page_type.h" class DictionaryValue; class TemplateURLModel; diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 4a2c7f5..eef69ef 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -26,7 +26,6 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" @@ -34,6 +33,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_source.h" +#include "content/common/page_transition_types.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/mock_host_resolver.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index ac58f16..521d29b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -85,7 +85,6 @@ #include "chrome/common/net/net_resource_provider.h" #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" -#include "chrome/common/result_codes.h" #include "chrome/installer/util/google_update_settings.h" #include "content/browser/browser_thread.h" #include "content/browser/plugin_service.h" @@ -94,6 +93,7 @@ #include "content/common/content_client.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" +#include "content/common/result_codes.h" #include "grit/app_locale_settings.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/browser_main_gtk.cc b/chrome/browser/browser_main_gtk.cc index f59fa9c..b63009a 100644 --- a/chrome/browser/browser_main_gtk.cc +++ b/chrome/browser/browser_main_gtk.cc @@ -15,9 +15,9 @@ #include "chrome/browser/browser_main_win.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/result_codes.h" #include "content/browser/renderer_host/render_sandbox_host_linux.h" #include "content/browser/zygote_host_linux.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm index 79ccb46..5bee90a 100644 --- a/chrome/browser/browser_main_mac.mm +++ b/chrome/browser/browser_main_mac.mm @@ -22,8 +22,8 @@ #include "chrome/browser/metrics/metrics_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/result_codes.h" #include "content/common/main_function_params.h" +#include "content/common/result_codes.h" #include "net/socket/client_socket_factory.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index 3d0a052..628ad1ed 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -27,12 +27,12 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" -#include "chrome/common/result_codes.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/shell_util.h" #include "content/common/main_function_params.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/winsock_init.h" diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc index ce233d9..27ff551 100644 --- a/chrome/browser/chromeos/login/eula_view.cc +++ b/chrome/browser/chromeos/login/eula_view.cc @@ -28,10 +28,10 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/views/dom_view.h" #include "chrome/browser/ui/views/window.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/url_constants.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/native_web_keyboard_event.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 549edc0..e44bb49 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -4,12 +4,12 @@ #include "base/file_path.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/common/notification_type.h" +#include "content/common/page_transition_types.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index c3f1ec6..84ae546 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -21,10 +21,10 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/pref_names.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/common/page_transition_types.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 0d3f472..ae1e9d3 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -12,11 +12,11 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/result_codes.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/result_codes.h" class ExtensionCrashRecoveryTest : public ExtensionBrowserTest { protected: diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 7cdb2c7..2b49c19 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -53,11 +53,11 @@ #include "chrome/browser/ui/webui/favicon_source.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/common/result_codes.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/common/notification_service.h" +#include "content/common/result_codes.h" #include "third_party/skia/include/core/SkBitmap.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 0566619..be193db 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -31,7 +31,6 @@ #include "chrome/common/bindings_policy.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" @@ -45,6 +44,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/webui/web_ui_factory.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_host_mac.mm b/chrome/browser/extensions/extension_host_mac.mm index 73e29fb..23ec35d 100644 --- a/chrome/browser/extensions/extension_host_mac.mm +++ b/chrome/browser/extensions/extension_host_mac.mm @@ -8,7 +8,7 @@ #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" -#include "chrome/common/native_web_keyboard_event.h" +#include "content/common/native_web_keyboard_event.h" ExtensionHostMac::~ExtensionHostMac() { // If there is a popup open for this host's extension, close it. diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 9e6fad1..6adfb35 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -13,8 +13,8 @@ #include "chrome/browser/extensions/key_identifier_conversion_views.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/common/native_web_keyboard_event.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/common/native_web_keyboard_event.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "views/events/event.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index 90221b8..d20e30e 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -23,10 +23,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/page_transition_types.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 629114d..a230364 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -32,8 +32,6 @@ #include "chrome/common/automation_messages.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/native_web_keyboard_event.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" @@ -41,7 +39,9 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/provisional_load_details.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" +#include "content/common/page_transition_types.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index a7793a6..98c1a68 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -17,8 +17,8 @@ #include "chrome/browser/ui/views/frame/browser_bubble_host.h" #include "chrome/browser/ui/views/infobars/infobar_container.h" #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" -#include "chrome/common/navigation_types.h" #include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/common/navigation_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "views/accelerator.h" diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h index 05cf53e4..260ffb2 100644 --- a/chrome/browser/first_run/first_run.h +++ b/chrome/browser/first_run/first_run.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/importer/importer_observer.h" -#include "chrome/common/result_codes.h" +#include "content/common/result_codes.h" #include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc index 85f072d..a29ed26 100644 --- a/chrome/browser/first_run/first_run_gtk.cc +++ b/chrome/browser/first_run/first_run_gtk.cc @@ -17,8 +17,8 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/gtk/first_run_dialog.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/result_codes.h" #include "chrome/installer/util/google_update_settings.h" +#include "content/common/result_codes.h" #include "googleurl/src/gurl.h" #include "ui/base/ui_base_switches.h" diff --git a/chrome/browser/hang_monitor/hung_window_detector.cc b/chrome/browser/hang_monitor/hung_window_detector.cc index ea864be..b196fb3 100644 --- a/chrome/browser/hang_monitor/hung_window_detector.cc +++ b/chrome/browser/hang_monitor/hung_window_detector.cc @@ -8,7 +8,7 @@ #include <atlbase.h> #include "base/logging.h" -#include "chrome/common/result_codes.h" +#include "content/common/result_codes.h" // How long do we wait for the terminated thread or process to die (in ms) static const int kTerminateTimeout = 2000; diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index 3898c3a..7090ad5 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -19,11 +19,11 @@ #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/ref_counted_util.h" #include "content/browser/cancelable_request.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "content/common/page_transition_types.h" class BookmarkService; struct DownloadCreateInfo; diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h index 9d0b082..5aef72f 100644 --- a/chrome/browser/history/history_types.h +++ b/chrome/browser/history/history_types.h @@ -19,9 +19,9 @@ #include "base/time.h" #include "chrome/browser/history/snippet.h" #include "chrome/browser/search_engines/template_url_id.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/ref_counted_util.h" #include "chrome/common/thumbnail_score.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" namespace history { diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc index ace5dac..7794065 100644 --- a/chrome/browser/history/visit_database.cc +++ b/chrome/browser/history/visit_database.cc @@ -13,8 +13,8 @@ #include "base/logging.h" #include "base/string_number_conversions.h" #include "chrome/browser/history/url_database.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" +#include "content/common/page_transition_types.h" // Rows, in order, of the visit table. #define HISTORY_VISIT_ROW_FIELDS \ diff --git a/chrome/browser/instant/instant_controller.h b/chrome/browser/instant/instant_controller.h index 6e1d619..6993af9 100644 --- a/chrome/browser/instant/instant_controller.h +++ b/chrome/browser/instant/instant_controller.h @@ -19,7 +19,7 @@ #include "chrome/browser/instant/instant_loader_delegate.h" #include "chrome/browser/search_engines/template_url_id.h" #include "chrome/common/instant_types.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index c47d916..5455bef 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -21,7 +21,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" #include "chrome/common/renderer_preferences.h" #include "content/browser/renderer_host/render_view_host.h" @@ -38,6 +37,7 @@ #include "content/common/notification_service.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" +#include "content/common/page_transition_types.h" #include "net/http/http_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h index f18d454..d6d9796 100644 --- a/chrome/browser/instant/instant_loader.h +++ b/chrome/browser/instant/instant_loader.h @@ -13,9 +13,9 @@ #include "chrome/browser/instant/instant_commit_type.h" #include "chrome/browser/search_engines/template_url_id.h" #include "chrome/common/instant_types.h" -#include "chrome/common/page_transition_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/load_notification_details.h b/chrome/browser/load_notification_details.h index f869bab..6e96c6e 100644 --- a/chrome/browser/load_notification_details.h +++ b/chrome/browser/load_notification_details.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/time.h" -#include "chrome/common/page_transition_types.h" #include "content/browser/tab_contents/navigation_controller.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" class LoadNotificationDetails { diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h index 8a19bd3..374889d 100644 --- a/chrome/browser/metrics/metrics_log.h +++ b/chrome/browser/metrics/metrics_log.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "chrome/common/metrics_helpers.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" struct AutocompleteLog; class DictionaryValue; diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc index 7ea3c53..9a57734 100644 --- a/chrome/browser/platform_util_chromeos.cc +++ b/chrome/browser/platform_util_chromeos.cc @@ -14,8 +14,8 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/filebrowse_ui.h" #include "chrome/browser/ui/webui/mediaplayer_ui.h" -#include "chrome/common/process_watcher.h" #include "content/browser/browser_thread.h" +#include "content/common/process_watcher.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/platform_util_common_linux.cc b/chrome/browser/platform_util_common_linux.cc index faf8a9f..feb1568 100644 --- a/chrome/browser/platform_util_common_linux.cc +++ b/chrome/browser/platform_util_common_linux.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "chrome/common/process_watcher.h" +#include "content/common/process_watcher.h" #include "googleurl/src/gurl.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/platform_util_linux.cc b/chrome/browser/platform_util_linux.cc index 514e438..b795cf9 100644 --- a/chrome/browser/platform_util_linux.cc +++ b/chrome/browser/platform_util_linux.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" -#include "chrome/common/process_watcher.h" +#include "content/common/process_watcher.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 6682706..2a2975c 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -21,7 +21,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/result_codes.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 2e8e475..2d62cdc 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -55,10 +55,8 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/pref_names.h" -#include "chrome/common/process_watcher.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" -#include "chrome/common/result_codes.h" #include "chrome/renderer/render_process_impl.h" #include "chrome/renderer/render_thread.h" #include "content/browser/appcache/appcache_dispatcher_host.h" @@ -94,7 +92,9 @@ #include "content/common/child_process_messages.h" #include "content/common/gpu_messages.h" #include "content/common/notification_service.h" +#include "content/common/process_watcher.h" #include "content/common/resource_messages.h" +#include "content/common/result_codes.h" #include "grit/generated_resources.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_platform_file.h" diff --git a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc index 788262d..5135d46 100644 --- a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc +++ b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc @@ -17,9 +17,9 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/common/native_web_keyboard_event.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/renderer_host/gtk_key_bindings_handler.cc b/chrome/browser/renderer_host/gtk_key_bindings_handler.cc index 8f3d765..52b1b6b 100644 --- a/chrome/browser/renderer_host/gtk_key_bindings_handler.cc +++ b/chrome/browser/renderer_host/gtk_key_bindings_handler.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/native_web_keyboard_event.h" +#include "content/common/native_web_keyboard_event.h" GtkKeyBindingsHandler::GtkKeyBindingsHandler(GtkWidget* parent_widget) : handler_(CreateNewHandler()) { diff --git a/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc b/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc index bf62fe7..a12e3f5 100644 --- a/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc +++ b/chrome/browser/renderer_host/gtk_key_bindings_handler_unittest.cc @@ -15,7 +15,7 @@ #include "base/string_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/edit_command.h" -#include "chrome/common/native_web_keyboard_event.h" +#include "content/common/native_web_keyboard_event.h" #include "testing/gtest/include/gtest/gtest.h" class GtkKeyBindingsHandlerTest : public testing::Test { diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index b2708df..354ba33 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -29,11 +29,11 @@ #include "chrome/browser/renderer_host/gtk_key_bindings_handler.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/native_web_keyboard_event.h" #include "content/browser/renderer_host/backing_store_x.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/common/native_web_keyboard_event.h" #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/x/x11_util.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index fea669b..a1c9496 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -26,7 +26,6 @@ #import "chrome/browser/ui/cocoa/view_id_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/edit_command.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" #include "content/browser/browser_thread.h" #include "content/browser/gpu_process_host.h" @@ -36,6 +35,7 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/common/gpu_messages.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/plugin_messages.h" #include "skia/ext/platform_canvas.h" #import "third_party/mozilla/ComplexTextInputPanel.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc index 2cfd7ce3..62236b6 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc @@ -14,12 +14,12 @@ #include "base/string_number_conversions.h" #include "base/task.h" #include "base/time.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" -#include "chrome/common/result_codes.h" #include "content/browser/renderer_host/backing_store_skia.h" #include "content/browser/renderer_host/backing_store_x.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/common/native_web_keyboard_event.h" +#include "content/common/result_codes.h" #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index c6179c0..a123a13 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -20,7 +20,6 @@ #include "chrome/browser/browser_trial.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" #include "content/browser/browser_thread.h" #include "content/browser/plugin_process_host.h" @@ -28,6 +27,7 @@ #include "content/browser/renderer_host/backing_store_win.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_widget_host.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "content/common/plugin_messages.h" #include "grit/webkit_resources.h" diff --git a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc index 2244506..7216a6a 100644 --- a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc +++ b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc @@ -8,11 +8,11 @@ #include "base/process_util.h" #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/result_codes.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/result_codes.h" #include "testing/gtest/include/gtest/gtest.h" class WebCacheManagerBrowserTest : public InProcessBrowserTest { diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 0e7bf3a..6ff8980 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -9,10 +9,10 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/common/page_transition_types.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/page_transition_types.h" typedef InProcessBrowserTest SessionRestoreTest; diff --git a/chrome/browser/sessions/session_types.h b/chrome/browser/sessions/session_types.h index 529393b..3a70156 100644 --- a/chrome/browser/sessions/session_types.h +++ b/chrome/browser/sessions/session_types.h @@ -13,7 +13,7 @@ #include "base/string16.h" #include "base/time.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/sync/glue/session_model_associator_unittest.cc b/chrome/browser/sync/glue/session_model_associator_unittest.cc index 9f0ce3c..a33147f 100644 --- a/chrome/browser/sync/glue/session_model_associator_unittest.cc +++ b/chrome/browser/sync/glue/session_model_associator_unittest.cc @@ -9,8 +9,8 @@ #include "base/values.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sync/glue/session_model_associator.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" +#include "content/common/page_transition_types.h" #include "testing/gtest/include/gtest/gtest.h" using browser_sync::SessionModelAssociator; diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h index 2aac2407..b0f4e65 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.h +++ b/chrome/browser/tab_contents/render_view_context_menu.h @@ -12,8 +12,8 @@ #include "base/string16.h" #include "base/scoped_vector.h" -#include "chrome/common/page_transition_types.h" #include "chrome/browser/extensions/extension_menu_manager.h" +#include "content/common/page_transition_types.h" #include "ui/base/models/simple_menu_model.h" #include "webkit/glue/context_menu.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/tabs/pinned_tab_codec.cc b/chrome/browser/tabs/pinned_tab_codec.cc index e08507c..7b89949 100644 --- a/chrome/browser/tabs/pinned_tab_codec.cc +++ b/chrome/browser/tabs/pinned_tab_codec.cc @@ -12,9 +12,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/page_transition_types.h" typedef BrowserInit::LaunchWithProfile::Tab Tab; diff --git a/chrome/browser/tabs/tab_finder.cc b/chrome/browser/tabs/tab_finder.cc index 5fde653..6826316 100644 --- a/chrome/browser/tabs/tab_finder.cc +++ b/chrome/browser/tabs/tab_finder.cc @@ -11,7 +11,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages_params.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" @@ -19,6 +18,7 @@ #include "content/common/notification_service.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" +#include "content/common/page_transition_types.h" class TabFinder::TabContentsObserverImpl : public TabContentsObserver { public: diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h index 04c3743..9807a22 100644 --- a/chrome/browser/tabs/tab_strip_model.h +++ b/chrome/browser/tabs/tab_strip_model.h @@ -11,9 +11,9 @@ #include "base/observer_list.h" #include "chrome/browser/tabs/tab_strip_model_observer.h" #include "chrome/browser/tabs/tab_strip_selection_model.h" -#include "chrome/common/page_transition_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "content/common/page_transition_types.h" class NavigationController; class Profile; diff --git a/chrome/browser/tabs/tab_strip_model_delegate.h b/chrome/browser/tabs/tab_strip_model_delegate.h index b5e7f4d..8eb25c5 100644 --- a/chrome/browser/tabs/tab_strip_model_delegate.h +++ b/chrome/browser/tabs/tab_strip_model_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_TABS_TAB_STRIP_MODEL_DELEGATE_H_ #pragma once -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" class Browser; class DockInfo; diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.h b/chrome/browser/tabs/tab_strip_model_order_controller.h index 5ecaa2c..5b1476d 100644 --- a/chrome/browser/tabs/tab_strip_model_order_controller.h +++ b/chrome/browser/tabs/tab_strip_model_order_controller.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" class TabContentsWrapper; diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 0c652b5..d9e65e9 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -20,12 +20,12 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/task_manager_resource_providers.h" #include "chrome/common/pref_names.h" -#include "chrome/common/result_codes.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/result_codes.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 25664de..32ae49a 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -22,10 +22,10 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/page_transition_types.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/page_transition_types.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 4ba8874..cce8fb0 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -91,7 +91,6 @@ #include "chrome/common/content_restriction.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" #include "chrome/common/url_constants.h" @@ -105,6 +104,7 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/notification_service.h" +#include "content/common/page_transition_types.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 6149a41..e6387d5 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -33,11 +33,11 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/page_transition_types.h" -#include "chrome/common/page_zoom.h" #include "content/browser/tab_contents/page_navigator.h" #include "content/browser/tab_contents/tab_contents_delegate.h" #include "content/common/notification_registrar.h" +#include "content/common/page_transition_types.h" +#include "content/common/page_zoom.h" #include "ui/gfx/rect.h" class BrowserTabRestoreServiceDelegate; diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 5497b2a..0bfa68f 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -52,7 +52,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" -#include "chrome/common/result_codes.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/browser_distribution.h" #include "content/browser/browser_thread.h" @@ -61,6 +60,7 @@ #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc index 95a546f..48776c2 100644 --- a/chrome/browser/ui/browser_list.cc +++ b/chrome/browser/ui/browser_list.cc @@ -12,11 +12,11 @@ #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/result_codes.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/common/notification_registrar.h" #include "content/common/notification_service.h" +#include "content/common/result_codes.h" #if defined(OS_MACOSX) #include "chrome/browser/chrome_browser_application_mac.h" diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h index c3f066a..7344e1d 100644 --- a/chrome/browser/ui/browser_navigator.h +++ b/chrome/browser/ui/browser_navigator.h @@ -8,7 +8,7 @@ #include <string> -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "googleurl/src/gurl.h" #include "ui/gfx/rect.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 37049d6..70045d1 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -34,9 +34,9 @@ #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm index b5b291b..9e43291 100644 --- a/chrome/browser/ui/cocoa/html_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/html_dialog_window_controller.mm @@ -13,8 +13,8 @@ #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h" #include "chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" -#include "chrome/common/native_web_keyboard_event.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/native_web_keyboard_event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 5a9e2a8..5483545 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -14,10 +14,10 @@ #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/result_codes.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 76f829cf..e04a5ea 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -71,10 +71,10 @@ #include "chrome/browser/ui/webui/bug_report_ui.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index 70b6ff4..81fe41f 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_gtk.cc @@ -32,9 +32,9 @@ #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/common/native_web_keyboard_event.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/html_dialog_gtk.cc b/chrome/browser/ui/gtk/html_dialog_gtk.cc index eaed32b..fef05dd 100644 --- a/chrome/browser/ui/gtk/html_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/html_dialog_gtk.cc @@ -13,8 +13,8 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" -#include "chrome/common/native_web_keyboard_event.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/native_web_keyboard_event.h" namespace browser { diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index 15bffcd..9ceba43 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -12,10 +12,10 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/result_codes.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index 76e3ad6..859c97d 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -48,10 +48,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" +#include "content/common/page_transition_types.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.h b/chrome/browser/ui/gtk/location_bar_view_gtk.h index 8bc3b91..5d489b2 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.h +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.h @@ -24,9 +24,9 @@ #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/page_transition_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" +#include "content/common/page_transition_types.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/omnibox/location_bar.h b/chrome/browser/ui/omnibox/location_bar.h index 0183745..d0916b1 100644 --- a/chrome/browser/ui/omnibox/location_bar.h +++ b/chrome/browser/ui/omnibox/location_bar.h @@ -17,7 +17,7 @@ #include "base/string16.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/instant/instant_delegate.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "webkit/glue/window_open_disposition.h" class AutocompleteEditView; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index b6e917f..e4e515b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -30,13 +30,13 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/page_navigator.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" +#include "content/common/page_transition_types.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index 8243786..657176a 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -14,8 +14,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/browser/ui/views/event_utils.h" -#include "chrome/common/page_transition_types.h" #include "content/browser/tab_contents/page_navigator.h" +#include "content/common/page_transition_types.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h index 5b9dabf..7e73a4b 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.h +++ b/chrome/browser/ui/views/dropdown_bar_host.h @@ -7,7 +7,7 @@ #pragma once #include "base/scoped_ptr.h" -#include "chrome/common/native_web_keyboard_event.h" +#include "content/common/native_web_keyboard_event.h" #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index b9c704c..20ee92b 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -8,8 +8,8 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/views/window.h" -#include "chrome/common/native_web_keyboard_event.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/native_web_keyboard_event.h" #include "ui/base/keycodes/keyboard_codes.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index acea226..4f5d7c1 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/result_codes.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h index 111b8849..0e7127b 100644 --- a/chrome/browser/ui/views/unhandled_keyboard_event_handler.h +++ b/chrome/browser/ui/views/unhandled_keyboard_event_handler.h @@ -7,7 +7,7 @@ #pragma once #include "views/view.h" -#include "chrome/common/native_web_keyboard_event.h" +#include "content/common/native_web_keyboard_event.h" namespace views { class FocusManager; diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index c087b41..f0a9928 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -9,9 +9,9 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/shell_integration.h" -#include "chrome/common/result_codes.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/shell_util.h" +#include "content/common/result_codes.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc index 00b8d82..54a19f6 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc @@ -11,10 +11,10 @@ #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_tokenizer.h" -#include "chrome/common/process_watcher.h" #include "chrome/browser/browser_list.h" #include "content/browser/browser_thread.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/common/process_watcher.h" #include "ui/base/gtk/gtk_signal.h" // Command used to configure GNOME proxy settings. The command was renamed diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index b6b5601..2f58ec6 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -71,10 +71,6 @@ 'common/nacl_messages.cc', 'common/nacl_messages.h', 'common/nacl_types.h', - 'common/process_watcher.h', - 'common/process_watcher_mac.cc', - 'common/process_watcher_posix.cc', - 'common/process_watcher_win.cc', 'common/profiling.cc', 'common/profiling.h', 'common/ref_counted_util.h', @@ -82,10 +78,6 @@ 'common/safebrowsing_messages.h', 'common/sandbox_policy.cc', 'common/sandbox_policy.h', - 'common/set_process_title.cc', - 'common/set_process_title.h', - 'common/set_process_title_linux.cc', - 'common/set_process_title_linux.h', 'common/switch_utils.cc', 'common/switch_utils.h', 'common/time_format.cc', @@ -204,17 +196,7 @@ 'common/jstemplate_builder.h', 'common/libxml_utils.cc', 'common/libxml_utils.h', - 'common/native_web_keyboard_event.h', - 'common/native_web_keyboard_event_linux.cc', - 'common/native_web_keyboard_event_mac.mm', - 'common/native_web_keyboard_event_win.cc', 'common/native_window_notification_source.h', - 'common/navigation_gesture.h', - 'common/navigation_types.h', - 'common/page_transition_types.cc', - 'common/page_transition_types.h', - 'common/page_type.h', - 'common/page_zoom.h', 'common/pepper_plugin_registry.cc', 'common/pepper_plugin_registry.h', 'common/persistent_pref_store.h', @@ -340,14 +322,6 @@ ], }], ['OS=="mac"', { - 'sources!': [ - 'common/process_watcher_posix.cc', - ], - 'link_settings': { - 'mac_bundle_resources': [ - 'common/common.sb', - ], - }, 'include_dirs': [ '../third_party/GTM', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 164dbdd..6db8bb3 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1739,7 +1739,6 @@ 'common/net/gaia/gaia_authenticator_unittest.cc', 'common/net/gaia/google_service_auth_error_unittest.cc', 'common/net/url_fetcher_unittest.cc', - 'common/process_watcher_unittest.cc', 'common/render_messages_unittest.cc', 'common/service_process_util_unittest.cc', 'common/switch_utils_unittest.cc', @@ -1825,6 +1824,7 @@ '../content/common/gpu_info_unittest.cc', '../content/common/mru_cache_unittest.cc', '../content/common/notification_service_unittest.cc', + '../content/common/process_watcher_unittest.cc', '../content/common/property_bag_unittest.cc', '../content/common/resource_dispatcher_unittest.cc', '../content/common/sandbox_mac_diraccess_unittest.mm', diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h index 5bd74b1..2ae5214 100644 --- a/chrome/common/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "chrome/common/automation_constants.h" #include "chrome/common/common_param_traits.h" -#include "chrome/common/page_type.h" #include "chrome/common/security_style.h" #include "content/common/common_param_traits.h" +#include "content/common/page_type.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" #include "net/base/host_port_pair.h" diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index 3493bd4..9b3e9f7 100644 --- a/chrome/common/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -9,8 +9,8 @@ #include "base/string16.h" #include "chrome/common/content_settings.h" -#include "chrome/common/navigation_types.h" #include "chrome/test/automation/autocomplete_edit_proxy.h" +#include "content/common/navigation_types.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_message_macros.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/common/common.sb b/chrome/common/common.sb deleted file mode 100644 index ec97f66..0000000 --- a/chrome/common/common.sb +++ /dev/null @@ -1,36 +0,0 @@ -;; -;; Copyright (c) 2010 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. -;; -; This configuration file isn't used on it's own, but instead implicitly -; included at the start of all other sandbox configuration files in Chrome. -(version 1) - -; DISABLE_SANDBOX_DENIAL_LOGGING expands to syntax that turns off log message -; printing on sandbox exceptions; this functionality only exists on 10.6. The -; --enable-sandbox-logging flag or system versions <10.6 cause this flag to -; expand to an empty string. http://crbug.com/26621 -(deny default @DISABLE_SANDBOX_DENIAL_LOGGING@) - -; Support for programmatically enabling verbose debugging. -;ENABLE_LOGGING (debug deny) - -; Allow sending signals to self - http://crbug.com/20370 -(allow signal (target self)) - -; Needed for full-page-zoomed controls - http://crbug.com/11325 -(allow sysctl-read) - -; Each line is marked with the System version that needs it. -; This profile is tested with the following system versions: -; 10.5.6, 10.6 - -; Loading System Libraries. -(allow file-read* - (regex #"^/System/Library/Frameworks($|/)") - (regex #"^/System/Library/PrivateFrameworks($|/)") - (regex #"^/System/Library/CoreServices($|/)")) ; 10.5.6 - -; Needed for IPC on 10.6 -;10.6_ONLY (allow ipc-posix-shm) diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h index 70bd402..d25ce76 100644 --- a/chrome/common/common_param_traits.h +++ b/chrome/common/common_param_traits.h @@ -15,7 +15,7 @@ #include "base/file_util.h" #include "base/ref_counted.h" #include "chrome/common/content_settings.h" -#include "chrome/common/page_zoom.h" +#include "content/common/page_zoom.h" #include "ipc/ipc_message_utils.h" #include "printing/native_metafile.h" // !!! WARNING: DO NOT ADD NEW WEBKIT DEPENDENCIES !!! diff --git a/chrome/common/metrics_helpers.h b/chrome/common/metrics_helpers.h index 3de3fbd..9761280 100644 --- a/chrome/common/metrics_helpers.h +++ b/chrome/common/metrics_helpers.h @@ -16,7 +16,7 @@ #include "base/metrics/histogram.h" #include "base/scoped_ptr.h" #include "base/time.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" class GURL; class MetricsLog; diff --git a/chrome/common/native_web_keyboard_event.h b/chrome/common/native_web_keyboard_event.h deleted file mode 100644 index f27aa78..0000000 --- a/chrome/common/native_web_keyboard_event.h +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (c) 2009 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 CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_ -#define CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_ -#pragma once - -#include "base/basictypes.h" -#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" - -#if defined(OS_WIN) -#include <windows.h> -#elif defined(OS_MACOSX) -#ifdef __OBJC__ -@class NSEvent; -#else -class NSEvent; -#endif // __OBJC__ -#elif defined(OS_POSIX) -typedef struct _GdkEventKey GdkEventKey; -#endif - -// Owns a platform specific event; used to pass own and pass event through -// platform independent code. -struct NativeWebKeyboardEvent : public WebKit::WebKeyboardEvent { - NativeWebKeyboardEvent(); - -#if defined(OS_WIN) - NativeWebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); -#elif defined(OS_MACOSX) - explicit NativeWebKeyboardEvent(NSEvent *event); - NativeWebKeyboardEvent(wchar_t character, - int state, - double time_stamp_seconds); -#elif defined(TOOLKIT_USES_GTK) - explicit NativeWebKeyboardEvent(const GdkEventKey* event); - NativeWebKeyboardEvent(wchar_t character, - int state, - double time_stamp_seconds); -#endif - - NativeWebKeyboardEvent(const NativeWebKeyboardEvent& event); - ~NativeWebKeyboardEvent(); - - NativeWebKeyboardEvent& operator=(const NativeWebKeyboardEvent& event); - -#if defined(OS_WIN) - MSG os_event; -#elif defined(OS_MACOSX) - NSEvent* os_event; -#elif defined(TOOLKIT_USES_GTK) - GdkEventKey* os_event; -#endif - - // True if the browser should ignore this event if it's not handled by the - // renderer. This happens for RawKeyDown events that are created while IME is - // active and is necessary to prevent backspace from doing "history back" if - // it is hit in ime mode. - // Currently, it's only used by Linux and Mac ports. - bool skip_in_browser; - -#if defined(OS_LINUX) - // True if the key event matches an edit command. In order to ensure the edit - // command always work in web page, the browser should not pre-handle this key - // event as a reserved accelerator. See http://crbug.com/54573 - bool match_edit_command; -#endif -}; - -#endif // CHROME_COMMON_NATIVE_WEB_KEYBOARD_EVENT_H_ diff --git a/chrome/common/native_web_keyboard_event_linux.cc b/chrome/common/native_web_keyboard_event_linux.cc deleted file mode 100644 index 46fafd5..0000000 --- a/chrome/common/native_web_keyboard_event_linux.cc +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright (c) 2009 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 "chrome/common/native_web_keyboard_event.h" - -#include <gdk/gdk.h> - -#include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" - -using WebKit::WebInputEventFactory; - -namespace { - -void CopyEventTo(const GdkEventKey* in, GdkEventKey** out) { - if (in) { - *out = reinterpret_cast<GdkEventKey*>( - gdk_event_copy( - reinterpret_cast<GdkEvent*>(const_cast<GdkEventKey*>(in)))); - } else { - *out = NULL; - } -} - -void FreeEvent(GdkEventKey* event) { - if (event) { - gdk_event_free(reinterpret_cast<GdkEvent*>(event)); - } -} - -} // namespace - - -NativeWebKeyboardEvent::NativeWebKeyboardEvent() - : os_event(NULL), - skip_in_browser(false), - match_edit_command(false) { -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent(const GdkEventKey* native_event) - : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(native_event)), - skip_in_browser(false), - match_edit_command(false) { - CopyEventTo(native_event, &os_event); -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent(wchar_t character, - int state, - double time_stamp_seconds) - : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(character, - state, - time_stamp_seconds)), - os_event(NULL), - skip_in_browser(false), - match_edit_command(false) { -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent( - const NativeWebKeyboardEvent& other) - : WebKeyboardEvent(other), - skip_in_browser(other.skip_in_browser), - match_edit_command(other.match_edit_command) { - CopyEventTo(other.os_event, &os_event); -} - -NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=( - const NativeWebKeyboardEvent& other) { - WebKeyboardEvent::operator=(other); - - FreeEvent(os_event); - CopyEventTo(other.os_event, &os_event); - - skip_in_browser = other.skip_in_browser; - match_edit_command = other.match_edit_command; - - return *this; -} - -NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { - FreeEvent(os_event); -} diff --git a/chrome/common/native_web_keyboard_event_mac.mm b/chrome/common/native_web_keyboard_event_mac.mm deleted file mode 100644 index 1fe53ae..0000000 --- a/chrome/common/native_web_keyboard_event_mac.mm +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2009 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 "chrome/common/native_web_keyboard_event.h" - -#import <AppKit/AppKit.h> - -#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h" - -using WebKit::WebInputEventFactory; - -NativeWebKeyboardEvent::NativeWebKeyboardEvent() - : os_event(NULL), - skip_in_browser(false) { -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent(NSEvent* event) - : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(event)), - os_event([event retain]), - skip_in_browser(false) { -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent(wchar_t character, - int modifiers, - double time_stamp_seconds) - : WebKeyboardEvent(WebInputEventFactory::keyboardEvent(character, - modifiers, - time_stamp_seconds)), - os_event(NULL), - skip_in_browser(false) { -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent( - const NativeWebKeyboardEvent& other) - : WebKeyboardEvent(other), - os_event([other.os_event retain]), - skip_in_browser(other.skip_in_browser) { -} - -NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=( - const NativeWebKeyboardEvent& other) { - WebKeyboardEvent::operator=(other); - - NSObject* previous = os_event; - os_event = [other.os_event retain]; - [previous release]; - - skip_in_browser = other.skip_in_browser; - - return *this; -} - -NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { - [os_event release]; -} diff --git a/chrome/common/native_web_keyboard_event_win.cc b/chrome/common/native_web_keyboard_event_win.cc deleted file mode 100644 index 3f03d28..0000000 --- a/chrome/common/native_web_keyboard_event_win.cc +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) 2009 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 "chrome/common/native_web_keyboard_event.h" - -#include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" - -using WebKit::WebInputEventFactory; -using WebKit::WebKeyboardEvent; - -NativeWebKeyboardEvent::NativeWebKeyboardEvent() - : skip_in_browser(false) { - memset(&os_event, 0, sizeof(os_event)); -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent( - HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) - : WebKeyboardEvent( - WebInputEventFactory::keyboardEvent(hwnd, message, wparam, lparam)), - skip_in_browser(false) { - os_event.hwnd = hwnd; - os_event.message = message; - os_event.wParam = wparam; - os_event.lParam = lparam; -} - -NativeWebKeyboardEvent::NativeWebKeyboardEvent( - const NativeWebKeyboardEvent& other) - : WebKeyboardEvent(other), - skip_in_browser(other.skip_in_browser) { - os_event.hwnd = other.os_event.hwnd; - os_event.message = other.os_event.message; - os_event.wParam = other.os_event.wParam; - os_event.lParam = other.os_event.lParam; -} - -NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=( - const NativeWebKeyboardEvent& other) { - WebKeyboardEvent::operator=(other); - - os_event.hwnd = other.os_event.hwnd; - os_event.message = other.os_event.message; - os_event.wParam = other.os_event.wParam; - os_event.lParam = other.os_event.lParam; - - skip_in_browser = other.skip_in_browser; - - return *this; -} - -NativeWebKeyboardEvent::~NativeWebKeyboardEvent() { - // Noop under windows -} diff --git a/chrome/common/navigation_gesture.h b/chrome/common/navigation_gesture.h deleted file mode 100644 index 729f4d2..0000000 --- a/chrome/common/navigation_gesture.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2010 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 CHROME_COMMON_NAVIGATION_GESTURE_H_ -#define CHROME_COMMON_NAVIGATION_GESTURE_H_ -#pragma once - -enum NavigationGesture { - // User initiated navigation/load. - NavigationGestureUser, - // Non-user initiated navigation/load. For example, onload- or - // setTimeout-triggered document.location changes and form.submits. See - // http://b/1046841 for some cases that should be treated this way but aren't. - NavigationGestureAuto, - // Initial state. - NavigationGestureUnknown, -}; - -#endif // CHROME_COMMON_NAVIGATION_GESTURE_H_ diff --git a/chrome/common/navigation_types.h b/chrome/common/navigation_types.h deleted file mode 100644 index 39c2a98..0000000 --- a/chrome/common/navigation_types.h +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) 2006-2008 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 CHROME_COMMON_NAVIGATION_TYPES_H_ -#define CHROME_COMMON_NAVIGATION_TYPES_H_ -#pragma once - -#include "base/basictypes.h" - -// Indicates different types of navigations that can occur that we will handle -// separately. -class NavigationType { - public: - enum Type { - // Unknown type. - UNKNOWN, - - // A new page was navigated in the main frame. - NEW_PAGE, - - // Renavigating to an existing navigation entry. The entry is guaranteed to - // exist in the list, or else it would be a new page or IGNORE navigation. - EXISTING_PAGE, - - // The same page has been reloaded as a result of the user requesting - // navigation to that same page (like pressing Enter in the URL bar). This - // is not the same as an in-page navigation because we'll actually have a - // pending entry for the load, which is then meaningless. - SAME_PAGE, - - // In page navigations are when the reference fragment changes. This will - // be in the main frame only (we won't even get notified of in-page - // subframe navigations). It may be for any page, not necessarily the last - // committed one (for example, whey going back to a page with a ref). - IN_PAGE, - - // A new subframe was manually navigated by the user. We will create a new - // NavigationEntry so they can go back to the previous subframe content - // using the back button. - NEW_SUBFRAME, - - // A subframe in the page was automatically loaded or navigated to such that - // a new navigation entry should not be created. There are two cases: - // 1. Stuff like iframes containing ads that the page loads automatically. - // The user doesn't want to see these, so we just update the existing - // navigation entry. - // 2. Going back/forward to previous subframe navigations. We don't create - // a new entry here either, just update the last committed entry. - // These two cases are actually pretty different, they just happen to - // require almost the same code to handle. - AUTO_SUBFRAME, - - // Nothing happened. This happens when we get information about a page we - // don't know anything about. It can also happen when an iframe in a popup - // navigated to about:blank is navigated. Nothing needs to be done. - NAV_IGNORE, - }; - - private: - // This class is for scoping only, so you shouldn't create an instance of it. - NavigationType() {} - - DISALLOW_COPY_AND_ASSIGN(NavigationType); -}; - -#endif // CHROME_COMMON_NAVIGATION_TYPES_H_ diff --git a/chrome/common/page_transition_types.cc b/chrome/common/page_transition_types.cc deleted file mode 100644 index bf686f9..0000000 --- a/chrome/common/page_transition_types.cc +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) 2010 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 "chrome/common/page_transition_types.h" - -#include "base/logging.h" - -// static -PageTransition::Type PageTransition::FromInt(int32 type) { - if (!ValidType(type)) { - NOTREACHED() << "Invalid transition type " << type; - - // Return a safe default so we don't have corrupt data in release mode. - return LINK; - } - return static_cast<Type>(type); -} - -// static -const char* PageTransition::CoreTransitionString(Type type) { - switch (type & PageTransition::CORE_MASK) { - case 0: return "link"; - case 1: return "typed"; - case 2: return "auto_bookmark"; - case 3: return "auto_subframe"; - case 4: return "manual_subframe"; - case 5: return "generated"; - case 6: return "start_page"; - case 7: return "form_submit"; - case 8: return "reload"; - case 9: return "keyword"; - case 10: return "keyword_generated"; - } - return NULL; -} diff --git a/chrome/common/page_transition_types.h b/chrome/common/page_transition_types.h deleted file mode 100644 index d764fe9..0000000 --- a/chrome/common/page_transition_types.h +++ /dev/null @@ -1,165 +0,0 @@ -// Copyright (c) 2010 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 CHROME_COMMON_PAGE_TRANSITION_TYPES_H__ -#define CHROME_COMMON_PAGE_TRANSITION_TYPES_H__ -#pragma once - -#include "base/basictypes.h" - -// This class is for scoping only. -class PageTransition { - public: - // Types of transitions between pages. These are stored in the history - // database to separate visits, and are reported by the renderer for page - // navigations. - // - // WARNING: don't change these numbers. They are written directly into the - // history database, so future versions will need the same values to match - // the enums. - // - // A type is made of a core value and a set of qualifiers. A type has one - // core value and 0 or or more qualifiers. - enum { - // User got to this page by clicking a link on another page. - LINK = 0, - - // User got this page by typing the URL in the URL bar. This should not be - // used for cases where the user selected a choice that didn't look at all - // like a URL; see GENERATED below. - // - // We also use this for other "explicit" navigation actions. - TYPED = 1, - - // User got to this page through a suggestion in the UI, for example, - // through the destinations page. - AUTO_BOOKMARK = 2, - - // This is a subframe navigation. This is any content that is automatically - // loaded in a non-toplevel frame. For example, if a page consists of - // several frames containing ads, those ad URLs will have this transition - // type. The user may not even realize the content in these pages is a - // separate frame, so may not care about the URL (see MANUAL below). - AUTO_SUBFRAME = 3, - - // For subframe navigations that are explicitly requested by the user and - // generate new navigation entries in the back/forward list. These are - // probably more important than frames that were automatically loaded in - // the background because the user probably cares about the fact that this - // link was loaded. - MANUAL_SUBFRAME = 4, - - // User got to this page by typing in the URL bar and selecting an entry - // that did not look like a URL. For example, a match might have the URL - // of a Google search result page, but appear like "Search Google for ...". - // These are not quite the same as TYPED navigations because the user - // didn't type or see the destination URL. - // See also KEYWORD. - GENERATED = 5, - - // The page was specified in the command line or is the start page. - START_PAGE = 6, - - // The user filled out values in a form and submitted it. NOTE that in - // some situations submitting a form does not result in this transition - // type. This can happen if the form uses script to submit the contents. - FORM_SUBMIT = 7, - - // The user "reloaded" the page, either by hitting the reload button or by - // hitting enter in the address bar. NOTE: This is distinct from the - // concept of whether a particular load uses "reload semantics" (i.e. - // bypasses cached data). For this reason, lots of code needs to pass - // around the concept of whether a load should be treated as a "reload" - // separately from their tracking of this transition type, which is mainly - // used for proper scoring for consumers who care about how frequently a - // user typed/visited a particular URL. - // - // SessionRestore and undo tab close use this transition type too. - RELOAD = 8, - - // The url was generated from a replaceable keyword other than the default - // search provider. If the user types a keyword (which also applies to - // tab-to-search) in the omnibox this qualifier is applied to the transition - // type of the generated url. TemplateURLModel then may generate an - // additional visit with a transition type of KEYWORD_GENERATED against the - // url 'http://' + keyword. For example, if you do a tab-to-search against - // wikipedia the generated url has a transition qualifer of KEYWORD, and - // TemplateURLModel generates a visit for 'wikipedia.org' with a transition - // type of KEYWORD_GENERATED. - KEYWORD = 9, - - // Corresponds to a visit generated for a keyword. See description of - // KEYWORD for more details. - KEYWORD_GENERATED = 10, - - // ADDING NEW CORE VALUE? Be sure to update the LAST_CORE and CORE_MASK - // values below. Also update CoreTransitionString(). - LAST_CORE = KEYWORD_GENERATED, - CORE_MASK = 0xFF, - - // Qualifiers - // Any of the core values above can be augmented by one or more qualifiers. - // These qualifiers further define the transition. - - // User used the Forward or Back button to navigate among browsing history. - FORWARD_BACK = 0x01000000, - - // The beginning of a navigation chain. - CHAIN_START = 0x10000000, - - // The last transition in a redirect chain. - CHAIN_END = 0x20000000, - - // Redirects caused by JavaScript or a meta refresh tag on the page. - CLIENT_REDIRECT = 0x40000000, - - // Redirects sent from the server by HTTP headers. It might be nice to - // break this out into 2 types in the future, permanent or temporary, if we - // can get that information from WebKit. - SERVER_REDIRECT = 0x80000000, - - // Used to test whether a transition involves a redirect. - IS_REDIRECT_MASK = 0xC0000000, - - // General mask defining the bits used for the qualifiers. - QUALIFIER_MASK = 0xFFFFFF00 - }; - - // The type used for the bitfield. - typedef unsigned int Type; - - static bool ValidType(int32 type) { - Type t = StripQualifier(static_cast<Type>(type)); - return (t <= LAST_CORE); - } - - static Type FromInt(int32 type); - - // Returns true if the given transition is a top-level frame transition, or - // false if the transition was for a subframe. - static bool IsMainFrame(Type type) { - int32 t = StripQualifier(type); - return (t != AUTO_SUBFRAME && t != MANUAL_SUBFRAME); - } - - // Returns whether a transition involves a redirection - static bool IsRedirect(Type type) { - return (type & IS_REDIRECT_MASK) != 0; - } - - // Simplifies the provided transition by removing any qualifier - static Type StripQualifier(Type type) { - return static_cast<Type>(type & ~QUALIFIER_MASK); - } - - // Return the qualifier - static int32 GetQualifier(Type type) { - return type & QUALIFIER_MASK; - } - - // Return a string version of the core type values. - static const char* CoreTransitionString(Type type); -}; - -#endif // CHROME_COMMON_PAGE_TRANSITION_TYPES_H__ diff --git a/chrome/common/page_type.h b/chrome/common/page_type.h deleted file mode 100644 index 2a2bd1a..0000000 --- a/chrome/common/page_type.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2009 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 CHROME_COMMON_PAGE_TYPE_H_ -#define CHROME_COMMON_PAGE_TYPE_H_ -#pragma once - -// The type of the page an entry corresponds to. Used by chrome_frame and the -// automation layer to detect the state of a TabContents. -enum PageType { - NORMAL_PAGE = 0, - ERROR_PAGE, - INTERSTITIAL_PAGE -}; - -#endif // CHROME_COMMON_PAGE_TYPE_H_ diff --git a/chrome/common/page_zoom.h b/chrome/common/page_zoom.h deleted file mode 100644 index 25fd3886..0000000 --- a/chrome/common/page_zoom.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2009 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 CHROME_COMMON_PAGE_ZOOM_H_ -#define CHROME_COMMON_PAGE_ZOOM_H_ -#pragma once - -#include "base/basictypes.h" - -class PageZoom { - public: - // This enum is the parameter to various text/page zoom commands so we know - // what the specific zoom command is. - enum Function { - ZOOM_OUT = -1, - RESET = 0, - ZOOM_IN = 1, - }; - - private: - DISALLOW_IMPLICIT_CONSTRUCTORS(PageZoom); -}; - -#endif // CHROME_COMMON_PAGE_ZOOM_H_ diff --git a/chrome/common/process_watcher.h b/chrome/common/process_watcher.h deleted file mode 100644 index 54550aa..0000000 --- a/chrome/common/process_watcher.h +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) 2006-2008 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 CHROME_COMMON_PROCESS_WATCHER_H_ -#define CHROME_COMMON_PROCESS_WATCHER_H_ -#pragma once - -#include "build/build_config.h" - -#include "base/basictypes.h" -#include "base/process.h" - -class ProcessWatcher { - public: - // This method ensures that the specified process eventually terminates, and - // then it closes the given process handle. - // - // It assumes that the process has already been signalled to exit, and it - // begins by waiting a small amount of time for it to exit. If the process - // does not appear to have exited, then this function starts to become - // aggressive about ensuring that the process terminates. - // - // On Linux this method does not block the calling thread. - // On OS X this method may block for up to 2 seconds. - // - // NOTE: The process handle must have been opened with the PROCESS_TERMINATE - // and SYNCHRONIZE permissions. - // - static void EnsureProcessTerminated(base::ProcessHandle process_handle); - -#if defined(OS_POSIX) && !defined(OS_MACOSX) - // The nicer version of EnsureProcessTerminated() that is patient and will - // wait for |process_handle| to finish and then reap it. - static void EnsureProcessGetsReaped(base::ProcessHandle process_handle); -#endif - - private: - // Do not instantiate this class. - ProcessWatcher(); - - DISALLOW_COPY_AND_ASSIGN(ProcessWatcher); -}; - -#endif // CHROME_COMMON_PROCESS_WATCHER_H_ diff --git a/chrome/common/process_watcher_mac.cc b/chrome/common/process_watcher_mac.cc deleted file mode 100644 index 2702fa7..0000000 --- a/chrome/common/process_watcher_mac.cc +++ /dev/null @@ -1,170 +0,0 @@ -// Copyright (c) 2009 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 "chrome/common/process_watcher.h" - -#include <errno.h> -#include <signal.h> -#include <sys/event.h> -#include <sys/types.h> -#include <sys/wait.h> - -#include "base/eintr_wrapper.h" -#include "base/file_util.h" -#include "base/time.h" - -namespace { - -const int kWaitBeforeKillSeconds = 2; - -// Reap |child| process. This call blocks until completion. -void BlockingReap(pid_t child) { - const pid_t result = HANDLE_EINTR(waitpid(child, NULL, 0)); - if (result == -1) { - PLOG(ERROR) << "waitpid(" << child << ", NULL, 0)"; - } -} - -// Waits for |timeout| seconds for the given |child| to exit and reap it. If -// the child doesn't exit within the time specified, kills it. -// -// This function takes two approaches: first, it tries to use kqueue to -// observe when the process exits. kevent can monitor a kqueue with a -// timeout, so this method is preferred to wait for a specified period of -// time. Once the kqueue indicates the process has exited, waitpid will reap -// the exited child. If the kqueue doesn't provide an exit event notification, -// before the timeout expires, or if the kqueue fails or misbehaves, the -// process will be mercilessly killed and reaped. -// -// A child process passed to this function may be in one of several states: -// running, terminated and not yet reaped, and (apparently, and unfortunately) -// terminated and already reaped. Normally, a process will at least have been -// asked to exit before this function is called, but this is not required. -// If a process is terminating and unreaped, there may be a window between the -// time that kqueue will no longer recognize it and when it becomes an actual -// zombie that a non-blocking (WNOHANG) waitpid can reap. This condition is -// detected when kqueue indicates that the process is not running and a -// non-blocking waitpid fails to reap the process but indicates that it is -// still running. In this event, a blocking attempt to reap the process -// collects the known-dying child, preventing zombies from congregating. -// -// In the event that the kqueue misbehaves entirely, as it might under a -// EMFILE condition ("too many open files", or out of file descriptors), this -// function will forcibly kill and reap the child without delay. This -// eliminates another potential zombie vector. (If you're out of file -// descriptors, you're probably deep into something else, but that doesn't -// mean that zombies be allowed to kick you while you're down.) -// -// The fact that this function seemingly can be called to wait on a child -// that's not only already terminated but already reaped is a bit of a -// problem: a reaped child's pid can be reclaimed and may refer to a distinct -// process in that case. The fact that this function can seemingly be called -// to wait on a process that's not even a child is also a problem: kqueue will -// work in that case, but waitpid won't, and killing a non-child might not be -// the best approach. -void WaitForChildToDie(pid_t child, int timeout) { - DCHECK(child > 0); - DCHECK(timeout > 0); - - // DON'T ADD ANY EARLY RETURNS TO THIS FUNCTION without ensuring that - // |child| has been reaped. Specifically, even if a kqueue, kevent, or other - // call fails, this function should fall back to the last resort of trying - // to kill and reap the process. Not observing this rule will resurrect - // zombies. - - int result; - - int kq = HANDLE_EINTR(kqueue()); - if (kq == -1) { - PLOG(ERROR) << "kqueue()"; - } else { - file_util::ScopedFD auto_close_kq(&kq); - - struct kevent change = {0}; - EV_SET(&change, child, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL); - result = HANDLE_EINTR(kevent(kq, &change, 1, NULL, 0, NULL)); - - if (result == -1) { - if (errno != ESRCH) { - PLOG(ERROR) << "kevent (setup " << child << ")"; - } else { - // At this point, one of the following has occurred: - // 1. The process has died but has not yet been reaped. - // 2. The process has died and has already been reaped. - // 3. The process is in the process of dying. It's no longer - // kqueueable, but it may not be waitable yet either. Mark calls - // this case the "zombie death race". - - result = HANDLE_EINTR(waitpid(child, NULL, WNOHANG)); - - if (result != 0) { - // A positive result indicates case 1. waitpid succeeded and reaped - // the child. A result of -1 indicates case 2. The child has already - // been reaped. In both of these cases, no further action is - // necessary. - return; - } - - // |result| is 0, indicating case 3. The process will be waitable in - // short order. Fall back out of the kqueue code to kill it (for good - // measure) and reap it. - } - } else { - // Keep track of the elapsed time to be able to restart kevent if it's - // interrupted. - base::TimeDelta remaining_delta = base::TimeDelta::FromSeconds(timeout); - base::Time deadline = base::Time::Now() + remaining_delta; - result = -1; - struct kevent event = {0}; - while (remaining_delta.InMilliseconds() > 0) { - const struct timespec remaining_timespec = remaining_delta.ToTimeSpec(); - result = kevent(kq, NULL, 0, &event, 1, &remaining_timespec); - if (result == -1 && errno == EINTR) { - remaining_delta = deadline - base::Time::Now(); - result = 0; - } else { - break; - } - } - - if (result == -1) { - PLOG(ERROR) << "kevent (wait " << child << ")"; - } else if (result > 1) { - LOG(ERROR) << "kevent (wait " << child << "): unexpected result " - << result; - } else if (result == 1) { - if ((event.fflags & NOTE_EXIT) && - (event.ident == static_cast<uintptr_t>(child))) { - // The process is dead or dying. This won't block for long, if at - // all. - BlockingReap(child); - return; - } else { - LOG(ERROR) << "kevent (wait " << child - << "): unexpected event: fflags=" << event.fflags - << ", ident=" << event.ident; - } - } - } - } - - // The child is still alive, or is very freshly dead. Be sure by sending it - // a signal. This is safe even if it's freshly dead, because it will be a - // zombie (or on the way to zombiedom) and kill will return 0 even if the - // signal is not delivered to a live process. - result = kill(child, SIGKILL); - if (result == -1) { - PLOG(ERROR) << "kill(" << child << ", SIGKILL)"; - } else { - // The child is definitely on the way out now. BlockingReap won't need to - // wait for long, if at all. - BlockingReap(child); - } -} - -} // namespace - -void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) { - WaitForChildToDie(process, kWaitBeforeKillSeconds); -} diff --git a/chrome/common/process_watcher_posix.cc b/chrome/common/process_watcher_posix.cc deleted file mode 100644 index 38a4e1b..0000000 --- a/chrome/common/process_watcher_posix.cc +++ /dev/null @@ -1,105 +0,0 @@ -// Copyright (c) 2009 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 "chrome/common/process_watcher.h" - -#include <errno.h> -#include <signal.h> -#include <sys/types.h> -#include <sys/wait.h> - -#include "base/eintr_wrapper.h" -#include "base/logging.h" -#include "base/threading/platform_thread.h" - -// Return true if the given child is dead. This will also reap the process. -// Doesn't block. -static bool IsChildDead(pid_t child) { - const pid_t result = HANDLE_EINTR(waitpid(child, NULL, WNOHANG)); - if (result == -1) { - PLOG(ERROR) << "waitpid(" << child << ")"; - NOTREACHED(); - } else if (result > 0) { - // The child has died. - return true; - } - - return false; -} - -// A thread class which waits for the given child to exit and reaps it. -// If the child doesn't exit within a couple of seconds, kill it. -class BackgroundReaper : public base::PlatformThread::Delegate { - public: - explicit BackgroundReaper(pid_t child, unsigned timeout) - : child_(child), - timeout_(timeout) { - } - - void ThreadMain() { - WaitForChildToDie(); - delete this; - } - - void WaitForChildToDie() { - // Wait forever case. - if (timeout_ == 0) { - pid_t r = HANDLE_EINTR(waitpid(child_, NULL, 0)); - if (r != child_) { - PLOG(ERROR) << "While waiting for " << child_ - << " to terminate, we got the following result: " << r; - } - return; - } - - // There's no good way to wait for a specific child to exit in a timed - // fashion. (No kqueue on Linux), so we just loop and sleep. - - // Wait for 2 * timeout_ 500 milliseconds intervals. - for (unsigned i = 0; i < 2 * timeout_; ++i) { - base::PlatformThread::Sleep(500); // 0.5 seconds - if (IsChildDead(child_)) - return; - } - - if (kill(child_, SIGKILL) == 0) { - // SIGKILL is uncatchable. Since the signal was delivered, we can - // just wait for the process to die now in a blocking manner. - if (HANDLE_EINTR(waitpid(child_, NULL, 0)) < 0) - PLOG(WARNING) << "waitpid"; - } else { - LOG(ERROR) << "While waiting for " << child_ << " to terminate we" - << " failed to deliver a SIGKILL signal (" << errno << ")."; - } - } - - private: - const pid_t child_; - // Number of seconds to wait, if 0 then wait forever and do not attempt to - // kill |child_|. - const unsigned timeout_; - - DISALLOW_COPY_AND_ASSIGN(BackgroundReaper); -}; - -// static -void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) { - // If the child is already dead, then there's nothing to do. - if (IsChildDead(process)) - return; - - const unsigned timeout = 2; // seconds - BackgroundReaper* reaper = new BackgroundReaper(process, timeout); - base::PlatformThread::CreateNonJoinable(0, reaper); -} - -// static -void ProcessWatcher::EnsureProcessGetsReaped(base::ProcessHandle process) { - // If the child is already dead, then there's nothing to do. - if (IsChildDead(process)) - return; - - BackgroundReaper* reaper = new BackgroundReaper(process, 0); - base::PlatformThread::CreateNonJoinable(0, reaper); -} diff --git a/chrome/common/process_watcher_unittest.cc b/chrome/common/process_watcher_unittest.cc deleted file mode 100644 index 9bde1ac..0000000 --- a/chrome/common/process_watcher_unittest.cc +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (c) 2009 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 "chrome/common/process_watcher.h" - -#if defined(OS_POSIX) -#include <sys/wait.h> - -#include "base/eintr_wrapper.h" -#include "base/process_util.h" -#include "base/test/multiprocess_test.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "testing/multiprocess_func_list.h" - -class ProcessWatcherTest : public base::MultiProcessTest { -}; - -namespace { - -bool IsProcessDead(base::ProcessHandle child) { - // waitpid() will actually reap the process which is exactly NOT what we - // want to test for. The good thing is that if it can't find the process - // we'll get a nice value for errno which we can test for. - const pid_t result = HANDLE_EINTR(waitpid(child, NULL, WNOHANG)); - return result == -1 && errno == ECHILD; -} - -} // namespace - -TEST_F(ProcessWatcherTest, DelayedTermination) { - base::ProcessHandle child_process = - SpawnChild("process_watcher_test_never_die", false); - ProcessWatcher::EnsureProcessTerminated(child_process); - base::WaitForSingleProcess(child_process, 5000); - - // Check that process was really killed. - EXPECT_TRUE(IsProcessDead(child_process)); - base::CloseProcessHandle(child_process); -} - -MULTIPROCESS_TEST_MAIN(process_watcher_test_never_die) { - while (1) { - sleep(500); - } - return 0; -} - -TEST_F(ProcessWatcherTest, ImmediateTermination) { - base::ProcessHandle child_process = - SpawnChild("process_watcher_test_die_immediately", false); - // Give it time to die. - sleep(2); - ProcessWatcher::EnsureProcessTerminated(child_process); - - // Check that process was really killed. - EXPECT_TRUE(IsProcessDead(child_process)); - base::CloseProcessHandle(child_process); -} - -MULTIPROCESS_TEST_MAIN(process_watcher_test_die_immediately) { - return 0; -} - -#endif // OS_POSIX diff --git a/chrome/common/process_watcher_win.cc b/chrome/common/process_watcher_win.cc deleted file mode 100644 index 3378960..0000000 --- a/chrome/common/process_watcher_win.cc +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) 2010 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 "chrome/common/process_watcher.h" - -#include "base/scoped_ptr.h" -#include "base/environment.h" -#include "base/message_loop.h" -#include "base/win/object_watcher.h" -#include "chrome/common/env_vars.h" -#include "chrome/common/result_codes.h" - -// Maximum amount of time (in milliseconds) to wait for the process to exit. -static const int kWaitInterval = 2000; - -namespace { - -class TimerExpiredTask : public Task, - public base::win::ObjectWatcher::Delegate { - public: - explicit TimerExpiredTask(base::ProcessHandle process) : process_(process) { - watcher_.StartWatching(process_, this); - } - - virtual ~TimerExpiredTask() { - if (process_) { - KillProcess(); - DCHECK(!process_) << "Make sure to close the handle."; - } - } - - // Task --------------------------------------------------------------------- - - virtual void Run() { - if (process_) - KillProcess(); - } - - // MessageLoop::Watcher ----------------------------------------------------- - - virtual void OnObjectSignaled(HANDLE object) { - // When we're called from KillProcess, the ObjectWatcher may still be - // watching. the process handle, so make sure it has stopped. - watcher_.StopWatching(); - - CloseHandle(process_); - process_ = NULL; - } - - private: - void KillProcess() { - scoped_ptr<base::Environment> env(base::Environment::Create()); - if (env->HasVar(env_vars::kHeadless)) { - // If running the distributed tests, give the renderer a little time - // to figure out that the channel is shutdown and unwind. - if (WaitForSingleObject(process_, kWaitInterval) == WAIT_OBJECT_0) { - OnObjectSignaled(process_); - return; - } - } - - // OK, time to get frisky. We don't actually care when the process - // terminates. We just care that it eventually terminates, and that's what - // TerminateProcess should do for us. Don't check for the result code since - // it fails quite often. This should be investigated eventually. - base::KillProcess(process_, ResultCodes::HUNG, false); - - // Now, just cleanup as if the process exited normally. - OnObjectSignaled(process_); - } - - // The process that we are watching. - base::ProcessHandle process_; - - base::win::ObjectWatcher watcher_; - - DISALLOW_COPY_AND_ASSIGN(TimerExpiredTask); -}; - -} // namespace - -// static -void ProcessWatcher::EnsureProcessTerminated(base::ProcessHandle process) { - DCHECK(process != GetCurrentProcess()); - - // If already signaled, then we are done! - if (WaitForSingleObject(process, 0) == WAIT_OBJECT_0) { - CloseHandle(process); - return; - } - - MessageLoop::current()->PostDelayedTask(FROM_HERE, - new TimerExpiredTask(process), - kWaitInterval); -} diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index e34f1e9..1cfb404 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -30,8 +30,6 @@ #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/instant_types.h" #include "chrome/common/nacl_types.h" -#include "chrome/common/page_transition_types.h" -#include "chrome/common/page_zoom.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/translate_errors.h" @@ -42,6 +40,8 @@ #include "content/common/common_param_traits.h" #include "content/common/geoposition.h" #include "content/common/notification_type.h" +#include "content/common/page_transition_types.h" +#include "content/common/page_zoom.h" #include "content/common/resource_response.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_message_macros.h" diff --git a/chrome/common/render_messages_params.cc b/chrome/common/render_messages_params.cc index 02ac083..f0fa5ea 100644 --- a/chrome/common/render_messages_params.cc +++ b/chrome/common/render_messages_params.cc @@ -4,7 +4,6 @@ #include "chrome/common/render_messages_params.h" -#include "chrome/common/navigation_gesture.h" #include "chrome/common/common_param_traits.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/render_messages.h" diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h index d746be3..596f5d6 100644 --- a/chrome/common/render_messages_params.h +++ b/chrome/common/render_messages_params.h @@ -18,11 +18,11 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_extent.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/navigation_gesture.h" -#include "chrome/common/navigation_types.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/renderer_preferences.h" #include "chrome/common/window_container_type.h" +#include "content/common/navigation_gesture.h" +#include "content/common/navigation_types.h" +#include "content/common/page_transition_types.h" #include "content/common/serialized_script_value.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_param_traits.h" diff --git a/chrome/common/result_codes.h b/chrome/common/result_codes.h deleted file mode 100644 index ae842bb..0000000 --- a/chrome/common/result_codes.h +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) 2010 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 CHROME_COMMON_RESULT_CODES_H_ -#define CHROME_COMMON_RESULT_CODES_H_ -#pragma once - -#include "base/process_util.h" - -// This file consolidates all the return codes for the browser and renderer -// process. The return code is the value that: -// a) is returned by main() or winmain(), or -// b) specified in the call for ExitProcess() or TerminateProcess(), or -// c) the exception value that causes a process to terminate. -// -// It is advisable to not use negative numbers because the Windows API returns -// it as an unsigned long and the exception values have high numbers. For -// example EXCEPTION_ACCESS_VIOLATION value is 0xC0000005. - -class ResultCodes { - public: - enum ExitCode { - NORMAL_EXIT = 0, // Process terminated normally. - KILLED = 1, // Process was killed by user or system. - HUNG = 2, // Process hung. - INVALID_CMDLINE_URL, // An invalid command line url was given. - SBOX_INIT_FAILED, // The sandbox could not be initialized. - GOOGLE_UPDATE_INIT_FAILED, // The Google Update client stub init failed. - GOOGLE_UPDATE_LAUNCH_FAILED,// Google Update could not launch chrome DLL. - BAD_PROCESS_TYPE, // The process is of an unknown type. - MISSING_PATH, // An critical chrome path is missing. - MISSING_DATA, // A critical chrome file is missing. - SHELL_INTEGRATION_FAILED, // Failed to make Chrome default browser. - MACHINE_LEVEL_INSTALL_EXISTS, // Machine level install exists - UNINSTALL_DELETE_FILE_ERROR,// Error while deleting shortcuts. - UNINSTALL_CHROME_ALIVE, // Uninstall detected another chrome instance. - UNINSTALL_NO_SURVEY, // Do not launch survey after uninstall. - UNINSTALL_USER_CANCEL, // The user changed her mind. - UNINSTALL_DELETE_PROFILE, // Delete profile as well during uninstall. - UNSUPPORTED_PARAM, // Command line parameter is not supported. - KILLED_BAD_MESSAGE, // A bad message caused the process termination. - IMPORTER_CANCEL, // The user canceled the browser import. - IMPORTER_HUNG, // Browser import hung and was killed. - RESPAWN_FAILED, // Trying to restart the browser we crashed. - - NORMAL_EXIT_EXP1, // The EXP1, EXP2, EXP3, EXP4 are generic codes - NORMAL_EXIT_EXP2, // used to communicate some simple outcome back - NORMAL_EXIT_EXP3, // to the process that launched us. This is - NORMAL_EXIT_EXP4, // used for experiments and the actual meaning - // depends on the experiment. - - NORMAL_EXIT_CANCEL, // For experiments this return code means that - // the user canceled causes the did_run "dr" - // signal to be reset so this chrome run does - // not count as active chrome usage. - - PROFILE_IN_USE, // The profile was in use on another host. - - UNINSTALL_EXTENSION_ERROR, // Failed to silently uninstall an extension. - PACK_EXTENSION_ERROR, // Failed to pack an extension via the cmd line. - - EXIT_LAST_CODE // Last return code (keep it last). - }; -}; - -#endif // CHROME_COMMON_RESULT_CODES_H_ diff --git a/chrome/common/sandbox_methods_linux.h b/chrome/common/sandbox_methods_linux.h deleted file mode 100644 index 08cb00b..0000000 --- a/chrome/common/sandbox_methods_linux.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2009 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 CHROME_COMMON_SANDBOX_METHODS_LINUX_H_ -#define CHROME_COMMON_SANDBOX_METHODS_LINUX_H_ -#pragma once - -// This is a list of sandbox IPC methods which the renderer may send to the -// sandbox host. See http://code.google.com/p/chromium/LinuxSandboxIPC -// This isn't the full list, values < 32 are reserved for methods called from -// Skia. -class LinuxSandbox { - public: - enum Methods { - METHOD_GET_FONT_FAMILY_FOR_CHARS = 32, - METHOD_LOCALTIME = 33, - METHOD_GET_CHILD_WITH_INODE = 34, - METHOD_GET_STYLE_FOR_STRIKE = 35, - METHOD_MAKE_SHARED_MEMORY_SEGMENT = 36, - METHOD_MATCH_WITH_FALLBACK = 37, - }; -}; - -#endif // CHROME_COMMON_SANDBOX_METHODS_LINUX_H_ diff --git a/chrome/common/set_process_title.cc b/chrome/common/set_process_title.cc deleted file mode 100644 index 2a772db..0000000 --- a/chrome/common/set_process_title.cc +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright (c) 2010 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 "chrome/common/set_process_title.h" - -#include "base/command_line.h" -#include "base/file_path.h" -#include "base/file_util.h" -#include "base/string_util.h" -#include "build/build_config.h" - -#if defined(OS_POSIX) -#include <limits.h> -#include <stdlib.h> -#include <unistd.h> -#endif - -#if defined(OS_LINUX) -#include <sys/prctl.h> - -// Linux/glibc doesn't natively have setproctitle(). -#include "chrome/common/set_process_title_linux.h" -#endif - -#if defined(OS_POSIX) && !defined(OS_MACOSX) - -void SetProcessTitleFromCommandLine(char** main_argv) { - // Build a single string which consists of all the arguments separated - // by spaces. We can't actually keep them separate due to the way the - // setproctitle() function works. - std::string title; - bool have_argv0 = false; - -#if defined(OS_LINUX) - if (main_argv) - setproctitle_init(main_argv); - - // In Linux we sometimes exec ourselves from /proc/self/exe, but this makes us - // show up as "exe" in process listings. Read the symlink /proc/self/exe and - // use the path it points at for our process title. Note that this is only for - // display purposes and has no TOCTTOU security implications. - FilePath target; - FilePath self_exe("/proc/self/exe"); - if (file_util::ReadSymbolicLink(self_exe, &target)) { - have_argv0 = true; - title = target.value(); - // If the binary has since been deleted, Linux appends " (deleted)" to the - // symlink target. Remove it, since this is not really part of our name. - const std::string kDeletedSuffix = " (deleted)"; - if (EndsWith(title, kDeletedSuffix, true)) - title.resize(title.size() - kDeletedSuffix.size()); -#if defined(PR_SET_NAME) - // If PR_SET_NAME is available at compile time, we try using it. We ignore - // any errors if the kernel does not support it at runtime though. When - // available, this lets us set the short process name that shows when the - // full command line is not being displayed in most process listings. - prctl(PR_SET_NAME, FilePath(title).BaseName().value().c_str()); -#endif - } -#endif - - const CommandLine* command_line = CommandLine::ForCurrentProcess(); - for (size_t i = 1; i < command_line->argv().size(); ++i) { - if (!title.empty()) - title += " "; - title += command_line->argv()[i]; - } - // Disable prepending argv[0] with '-' if we prepended it ourselves above. - setproctitle(have_argv0 ? "-%s" : "%s", title.c_str()); -} - -#else - -// All other systems (basically Windows & Mac) have no need or way to implement -// this function. -void SetProcessTitleFromCommandLine(char** /* main_argv */) { -} - -#endif - diff --git a/chrome/common/set_process_title.h b/chrome/common/set_process_title.h deleted file mode 100644 index 95defe8..0000000 --- a/chrome/common/set_process_title.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2010 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 CHROME_COMMON_SET_PROCESS_TITLE_H_ -#define CHROME_COMMON_SET_PROCESS_TITLE_H_ - -// Sets OS-specific process title information based on the command line. This -// does nothing if the OS doesn't support or need this capability. -// -// Pass in the argv from main(). On Windows, where there is no argv, you can -// pass NULL or just don't call this function, since it does nothing. This -// argv pointer will be cached so if you call this function again, you can pass -// NULL in the second call. This is to support the case where it's called once -// at startup, and later when a zygote is fork()ed. The later call doesn't have -// easy access to main's argv. -// -// On non-Mac Unix platforms, we exec ourselves from /proc/self/exe, but that -// makes the process name that shows up in "ps" etc. for the child processes -// show as "exe" instead of "chrome" or something reasonable. This function -// will try to fix it so the "effective" command line shows up instead. -void SetProcessTitleFromCommandLine(char** main_argv); - -#endif // CHROME_COMMON_SET_PROCESS_TITLE_H_ - diff --git a/chrome/common/set_process_title_linux.cc b/chrome/common/set_process_title_linux.cc deleted file mode 100644 index 837eb2a..0000000 --- a/chrome/common/set_process_title_linux.cc +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright (c) 2009 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. - -// This file implements BSD-style setproctitle() for Linux. -// It is written such that it can easily be compiled outside Chromium. -// -// The Linux kernel sets up two locations in memory to pass arguments and -// environment variables to processes. First, there are two char* arrays stored -// one after another: argv and environ. A pointer to argv is passed to main(), -// while glibc sets the global variable |environ| to point at the latter. Both -// of these arrays are terminated by a NULL pointer; the environment array is -// also followed by some empty space to allow additional variables to be added. -// -// These arrays contain pointers to a second location in memory, where the -// strings themselves are stored one after another: first all the arguments, -// then the environment variables. The kernel will allocate a single page of -// memory for this purpose, so the end of the page containing argv[0] is the -// end of the storage potentially available to store the process title. -// -// When the kernel reads the command line arguments for a process, it looks at -// the range of memory within this page that it initially used for the argument -// list. If the terminating '\0' character is still where it expects, nothing -// further is done. If it has been overwritten, the kernel will scan up to the -// size of a page looking for another. (Note, however, that in general not that -// much space is actually mapped, since argv[0] is rarely page-aligned and only -// one page is mapped.) -// -// Thus to change the process title, we must move any environment variables out -// of the way to make room for a potentially longer title, and then overwrite -// the memory pointed to by argv[0] with a single replacement string, making -// sure its size does not exceed the available space. -// -// It is perhaps worth noting that patches to add a system call to Linux for -// this, like in BSD, have never made it in: this is the "official" way to do -// this on Linux. Presumably it is not in glibc due to some disagreement over -// this position within the glibc project, leaving applications caught in the -// middle. (Also, only a very few applications need or want this anyway.) - -#include "chrome/common/set_process_title_linux.h" - -#include <stdarg.h> -#include <stdint.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> - -extern char** environ; - -static char** g_main_argv = NULL; -static char* g_orig_argv0 = NULL; - -void setproctitle(const char* fmt, ...) { - va_list ap; - size_t i, avail_size; - uintptr_t page_size, page, page_end; - // Sanity check before we try and set the process title. - // The BSD version allows fmt == NULL to restore the original title. - if (!g_main_argv || !environ || !fmt) - return; - if (!g_orig_argv0) { - // Save the original argv[0]. - g_orig_argv0 = strdup(g_main_argv[0]); - if (!g_orig_argv0) - return; - } - page_size = sysconf(_SC_PAGESIZE); - // Get the page on which the argument list and environment live. - page = (uintptr_t) g_main_argv[0]; - page -= page % page_size; - page_end = page + page_size; - // Move the environment out of the way. Note that we are moving the values, - // not the environment array itself (which may not be on the page we need - // to overwrite anyway). - for (i = 0; environ[i]; ++i) { - uintptr_t env_i = (uintptr_t) environ[i]; - // Only move the value if it's actually in the way. This avoids - // leaking copies of the values if this function is called again. - if (page <= env_i && env_i < page_end) { - char* copy = strdup(environ[i]); - // Be paranoid. Check for allocation failure and bail out. - if (!copy) - return; - environ[i] = copy; - } - } - // Put the title in argv[0]. We have to zero out the space first since the - // kernel doesn't actually look for a null terminator unless we make the - // argument list longer than it started. - avail_size = page_end - (uintptr_t) g_main_argv[0]; - memset(g_main_argv[0], 0, avail_size); - va_start(ap, fmt); - if (fmt[0] == '-') { - vsnprintf(g_main_argv[0], avail_size, &fmt[1], ap); - } else { - size_t size = snprintf(g_main_argv[0], avail_size, "%s ", g_orig_argv0); - if (size < avail_size) - vsnprintf(g_main_argv[0] + size, avail_size - size, fmt, ap); - } - va_end(ap); - g_main_argv[1] = NULL; -} - -// A version of this built into glibc would not need this function, since -// it could stash the argv pointer in __libc_start_main(). But we need it. -void setproctitle_init(char** main_argv) { - if (g_main_argv) - return; - - uintptr_t page_size = sysconf(_SC_PAGESIZE); - // Check that the argv array is in fact on the same page of memory - // as the environment array just as an added measure of protection. - if (((uintptr_t) environ) / page_size == ((uintptr_t) main_argv) / page_size) - g_main_argv = main_argv; -} diff --git a/chrome/common/set_process_title_linux.h b/chrome/common/set_process_title_linux.h deleted file mode 100644 index 92fbf70..0000000 --- a/chrome/common/set_process_title_linux.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2009 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 CHROME_COMMON_SET_PROCESS_TITLE_LINUX_H_ -#define CHROME_COMMON_SET_PROCESS_TITLE_LINUX_H_ -#pragma once - -// Set the process title that will show in "ps" and similar tools. Takes -// printf-style format string and arguments. After calling setproctitle() -// the original main() argv[] array should not be used. By default, the -// original argv[0] is prepended to the format; this can be disabled by -// including a '-' as the first character of the format string. -// -// This signature and naming is to be compatible with most other Unix -// implementations of setproctitle(). -void setproctitle(const char* fmt, ...); - -// Initialize state needed for setproctitle() on Linux. Pass the argv pointer -// from main() to setproctitle_init() before calling setproctitle(). -void setproctitle_init(char** main_argv); - -#endif // CHROME_COMMON_SET_PROCESS_TITLE_LINUX_H_ diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc index 0b98e2c..5d4f129 100644 --- a/chrome/installer/setup/uninstall.cc +++ b/chrome/installer/setup/uninstall.cc @@ -14,7 +14,6 @@ #include "base/win/registry.h" #include "base/win/scoped_handle.h" #include "base/win/windows_version.h" -#include "chrome/common/result_codes.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/installer/setup/install.h" @@ -32,6 +31,7 @@ #include "chrome/installer/util/self_cleaning_temp_dir.h" #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" +#include "content/common/result_codes.h" #include "rlz/win/lib/rlz_lib.h" // Build-time generated include file. diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 1ced0a9..9f41a03 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -25,7 +25,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/pref_names.h" -#include "chrome/common/result_codes.h" #include "chrome/installer/util/channel_info.h" #include "chrome/installer/util/product.h" #include "chrome/installer/util/install_util.h" @@ -35,6 +34,7 @@ #include "chrome/installer/util/helper.h" #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/wmi.h" +#include "content/common/result_codes.h" #include "installer_util_strings.h" // NOLINT diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index cec7168..548f21f 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -14,13 +14,13 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/result_codes.h" #include "chrome/common/sandbox_policy.h" #include "chrome/nacl/nacl_main_platform_delegate.h" #include "chrome/nacl/nacl_thread.h" #include "content/common/child_process.h" #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" +#include "content/common/result_codes.h" #include "ui/base/system_monitor/system_monitor.h" #if defined(OS_WIN) diff --git a/chrome/renderer/navigation_state.h b/chrome/renderer/navigation_state.h index e5071e9..8941542 100644 --- a/chrome/renderer/navigation_state.h +++ b/chrome/renderer/navigation_state.h @@ -12,7 +12,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" #include "chrome/common/extensions/url_pattern.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 9452660..4a67e9f 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -33,7 +33,6 @@ #include "chrome/common/extensions/extension_set.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/page_zoom.h" #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" @@ -95,6 +94,7 @@ #include "content/common/file_system/file_system_dispatcher.h" #include "content/common/file_system/webfilesystem_callback_dispatcher.h" #include "content/common/notification_service.h" +#include "content/common/page_zoom.h" #include "content/common/pepper_messages.h" #include "content/renderer/audio_message_filter.h" #include "content/renderer/device_orientation_dispatcher.h" diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index d1c9395..df971f9 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -24,8 +24,6 @@ #include "build/build_config.h" #include "chrome/common/content_settings.h" #include "chrome/common/edit_command.h" -#include "chrome/common/navigation_gesture.h" -#include "chrome/common/page_zoom.h" #include "chrome/common/renderer_preferences.h" #include "chrome/common/view_types.h" #include "chrome/renderer/external_popup_menu.h" @@ -33,6 +31,8 @@ #include "chrome/renderer/pepper_plugin_delegate_impl.h" #include "chrome/renderer/render_widget.h" #include "chrome/renderer/renderer_webcookiejar_impl.h" +#include "content/common/navigation_gesture.h" +#include "content/common/page_zoom.h" #include "ipc/ipc_platform_file.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h" diff --git a/chrome/renderer/render_view_browsertest.cc b/chrome/renderer/render_view_browsertest.cc index b446b39..a517601 100644 --- a/chrome/renderer/render_view_browsertest.cc +++ b/chrome/renderer/render_view_browsertest.cc @@ -10,12 +10,12 @@ #include "base/utf_string_conversions.h" #include "chrome/common/autofill_messages.h" #include "chrome/common/content_settings.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/renderer/autofill/autofill_agent.h" #include "chrome/renderer/print_web_view_helper.h" #include "chrome/test/render_view_test.h" +#include "content/common/native_web_keyboard_event.h" #include "net/base/net_errors.h" #include "printing/image.h" #include "printing/native_metafile.h" diff --git a/chrome/renderer/render_view_browsertest_mac.mm b/chrome/renderer/render_view_browsertest_mac.mm index 401e352..56fe589 100644 --- a/chrome/renderer/render_view_browsertest_mac.mm +++ b/chrome/renderer/render_view_browsertest_mac.mm @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/string16.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" #include "chrome/test/render_view_test.h" +#include "content/common/native_web_keyboard_event.h" #include "testing/gtest/include/gtest/gtest.h" #include <Cocoa/Cocoa.h> diff --git a/chrome/renderer/renderer_sandbox_support_linux.cc b/chrome/renderer/renderer_sandbox_support_linux.cc index c99d996..37f2b07 100644 --- a/chrome/renderer/renderer_sandbox_support_linux.cc +++ b/chrome/renderer/renderer_sandbox_support_linux.cc @@ -11,7 +11,7 @@ #include "base/pickle.h" #include "base/scoped_ptr.h" #include "chrome/common/chrome_descriptors.h" -#include "chrome/common/sandbox_methods_linux.h" +#include "content/common/sandbox_methods_linux.h" #include "content/common/unix_domain_socket_posix.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h" diff --git a/chrome/service/service_child_process_host.cc b/chrome/service/service_child_process_host.cc index 472b18b..d8f7a8d 100644 --- a/chrome/service/service_child_process_host.cc +++ b/chrome/service/service_child_process_host.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/process_util.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/result_codes.h" +#include "content/common/result_codes.h" #if defined(OS_WIN) #include "base/file_path.h" diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index 16690fb..47b64a8 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -20,11 +20,11 @@ #include "base/ref_counted.h" #include "chrome/browser/download/save_package.h" #include "chrome/common/automation_constants.h" -#include "chrome/common/page_type.h" #include "chrome/common/security_style.h" #include "chrome/test/automation/automation_handle_tracker.h" #include "chrome/test/automation/dom_element_proxy.h" #include "chrome/test/automation/javascript_execution_controller.h" +#include "content/common/page_type.h" #include "webkit/glue/window_open_disposition.h" class BrowserProxy; diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc index dcea7a3..b115361 100644 --- a/chrome/test/browser_with_test_window_test.cc +++ b/chrome/test/browser_with_test_window_test.cc @@ -11,13 +11,13 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/content_client.h" +#include "content/common/page_transition_types.h" BrowserWithTestWindowTest::BrowserWithTestWindowTest() : ui_thread_(BrowserThread::UI, message_loop()), diff --git a/chrome/test/chrome_process_util.cc b/chrome/test/chrome_process_util.cc index 7de9908..52cb120 100644 --- a/chrome/test/chrome_process_util.cc +++ b/chrome/test/chrome_process_util.cc @@ -10,7 +10,7 @@ #include "base/process_util.h" #include "base/time.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/result_codes.h" +#include "content/common/result_codes.h" using base::TimeDelta; using base::TimeTicks; diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h index 051e027..8958945 100644 --- a/chrome/test/in_process_browser_test.h +++ b/chrome/test/in_process_browser_test.h @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/scoped_temp_dir.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc index 1a730f8..ca2bd39 100644 --- a/chrome/test/render_view_test.cc +++ b/chrome/test/render_view_test.cc @@ -6,7 +6,6 @@ #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/renderer_preferences.h" @@ -19,6 +18,7 @@ #include "chrome/renderer/mock_render_process.h" #include "chrome/renderer/renderer_main_platform_delegate.h" #include "content/common/dom_storage_common.h" +#include "content/common/native_web_keyboard_event.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h index c83a8d4..e641573 100644 --- a/chrome/test/render_view_test.h +++ b/chrome/test/render_view_test.h @@ -10,13 +10,13 @@ #include "base/command_line.h" #include "base/scoped_ptr.h" -#include "chrome/common/native_web_keyboard_event.h" #include "chrome/renderer/mock_keyboard.h" #include "chrome/renderer/mock_render_thread.h" #include "chrome/renderer/render_view.h" #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/renderer_webkitclient_impl.h" #include "content/common/main_function_params.h" +#include "content/common/native_web_keyboard_event.h" #include "content/common/sandbox_init_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" diff --git a/chrome/test/test_location_bar.h b/chrome/test/test_location_bar.h index f3dc099..587d28f 100644 --- a/chrome/test/test_location_bar.h +++ b/chrome/test/test_location_bar.h @@ -8,7 +8,7 @@ #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/ui/omnibox/location_bar.h" -#include "chrome/common/page_transition_types.h" +#include "content/common/page_transition_types.h" #include "webkit/glue/window_open_disposition.h" class TestLocationBar : public LocationBar { |