diff options
129 files changed, 252 insertions, 460 deletions
diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc index 9f8fbaa..2cf7203 100644 --- a/chrome/browser/autocomplete/history_quick_provider.cc +++ b/chrome/browser/autocomplete/history_quick_provider.cc @@ -15,11 +15,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/history/in_memory_url_index.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/plugin_service.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/plugin_service.h" #include "googleurl/src/url_util.h" #include "net/base/escape.h" #include "net/base/net_util.h" diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index 90e75b3..77ca7af 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -23,13 +23,12 @@ #include "base/string16.h" #include "base/weak_ptr.h" #include "chrome/browser/autofill/field_types.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/cancelable_request.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/automation_constants.h" #include "chrome/common/content_settings.h" #include "chrome/common/notification_observer.h" -#include "ipc/ipc_message.h" +#include "content/browser/browser_thread.h" +#include "content/browser/cancelable_request.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "ipc/ipc_channel.h" #if defined(OS_WIN) diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h index 45620c5..14c1abf 100644 --- a/chrome/browser/automation/automation_provider_observers.h +++ b/chrome/browser/automation/automation_provider_observers.h @@ -15,7 +15,6 @@ #include "chrome/browser/automation/automation_provider_json.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/browsing_data_remover.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/history/history.h" @@ -29,6 +28,7 @@ #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_type.h" +#include "content/browser/cancelable_request.h" #include "ui/gfx/size.h" class AutocompleteEditModel; diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 51e8a17..b0a0685 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -17,11 +17,11 @@ #include "base/synchronization/waitable_event.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_service.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_types.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/cancelable_request.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 12767a7..ddf6743 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -26,9 +26,7 @@ #include "base/values.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/gpu_process_host.h" #include "chrome/browser/gpu_process_host_ui_shim.h" #include "chrome/browser/memory_details.h" #include "chrome/browser/metrics/histogram_synchronizer.h" @@ -36,8 +34,6 @@ #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/about_handler.h" @@ -48,6 +44,10 @@ #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/gpu_process_host.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" @@ -68,9 +68,9 @@ #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/cros/syslogs_library.h" #include "chrome/browser/chromeos/version_loader.h" -#include "chrome/browser/zygote_host_linux.h" +#include "content/browser/zygote_host_linux.h" #elif defined(OS_LINUX) -#include "chrome/browser/zygote_host_linux.h" +#include "content/browser/zygote_host_linux.h" #endif #if defined(USE_TCMALLOC) diff --git a/chrome/browser/browser_child_process_host.h b/chrome/browser/browser_child_process_host.h deleted file mode 100644 index 50774e1..0000000 --- a/chrome/browser/browser_child_process_host.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 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_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_ -#define CHROME_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/browser_child_process_host.h" - -#endif // CHROME_BROWSER_BROWSER_CHILD_PROCESS_HOST_H_ diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index c308536..feafe55 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -35,7 +35,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_impl.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_protocols.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extensions_startup.h" @@ -53,7 +52,6 @@ #include "chrome/browser/net/predictor_api.h" #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/net/websocket_experiment/websocket_experiment_runner.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_value_store.h" @@ -63,7 +61,6 @@ #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/search_engines/search_engine_type.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" @@ -90,6 +87,9 @@ #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" +#include "content/browser/renderer_host/resource_dispatcher_host.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 f80daa9..017bbfa 100644 --- a/chrome/browser/browser_main_gtk.cc +++ b/chrome/browser/browser_main_gtk.cc @@ -14,10 +14,10 @@ #include "chrome/browser/browser_main_gtk.h" #include "chrome/browser/browser_main_win.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/renderer_host/render_sandbox_host_linux.h" -#include "chrome/browser/zygote_host_linux.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 "ui/base/x/x11_util.h" #include "ui/base/x/x11_util_internal.h" diff --git a/chrome/browser/browser_message_filter.h b/chrome/browser/browser_message_filter.h deleted file mode 100644 index 8e1445d..0000000 --- a/chrome/browser/browser_message_filter.h +++ /dev/null @@ -1,12 +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_BROWSER_BROWSER_MESSAGE_FILTER_H_ -#define CHROME_BROWSER_BROWSER_MESSAGE_FILTER_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/browser_message_filter.h" - -#endif // CHROME_BROWSER_BROWSER_MESSAGE_FILTER_H_ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index f65c65b..a168a61 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -14,11 +14,9 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/automation/automation_provider_list.h" -#include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_main.h" #include "chrome/browser/browser_process_sub_thread.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_trial.h" #include "chrome/browser/debugger/browser_list_tabcontents_provider.h" #include "chrome/browser/debugger/devtools_http_protocol_handler.h" @@ -37,15 +35,12 @@ #include "chrome/browser/net/sdch_dictionary_fetcher.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/plugin_data_remover.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/plugin_updater.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/printing/print_preview_tab_controller.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/shell_integration.h" @@ -62,6 +57,11 @@ #include "chrome/common/switch_utils.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/google_update_constants.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" +#include "content/browser/plugin_service.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" #include "ipc/ipc_logging.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index dd6d8f0..7476f49 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -21,16 +21,11 @@ #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/jankometer.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/plugin_process_host.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/browser/service/service_process_control_manager.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" @@ -39,6 +34,11 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/switch_utils.h" +#include "content/browser/browser_thread.h" +#include "content/browser/plugin_process_host.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host.h" #include "net/predictor_api.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h deleted file mode 100644 index cb749ee..0000000 --- a/chrome/browser/cancelable_request.h +++ /dev/null @@ -1,12 +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_BROWSER_CANCELABLE_REQUEST_H_ -#define CHROME_BROWSER_CANCELABLE_REQUEST_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/cancelable_request.h" - -#endif // CHROME_BROWSER_CANCELABLE_REQUEST_H_ diff --git a/chrome/browser/cert_store.h b/chrome/browser/cert_store.h deleted file mode 100644 index 8c2ca5c..0000000 --- a/chrome/browser/cert_store.h +++ /dev/null @@ -1,12 +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_BROWSER_CERT_STORE_H_ -#define CHROME_BROWSER_CERT_STORE_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/cert_store.h" - -#endif // CHROME_BROWSER_CERT_STORE_H_ diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h deleted file mode 100644 index ecd2fcd..0000000 --- a/chrome/browser/certificate_manager_model.h +++ /dev/null @@ -1,11 +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_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ -#define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/certificate_manager_model.h" - -#endif // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ diff --git a/chrome/browser/certificate_viewer.h b/chrome/browser/certificate_viewer.h deleted file mode 100644 index 54ab294..0000000 --- a/chrome/browser/certificate_viewer.h +++ /dev/null @@ -1,12 +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_BROWSER_CERTIFICATE_VIEWER_H_ -#define CHROME_BROWSER_CERTIFICATE_VIEWER_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/certificate_viewer.h" - -#endif // CHROME_BROWSER_CERTIFICATE_VIEWER_H_ diff --git a/chrome/browser/child_process_launcher.h b/chrome/browser/child_process_launcher.h deleted file mode 100644 index 185595f..0000000 --- a/chrome/browser/child_process_launcher.h +++ /dev/null @@ -1,12 +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_BROWSER_CHILD_PROCESS_LAUNCHER_H_ -#define CHROME_BROWSER_CHILD_PROCESS_LAUNCHER_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/child_process_launcher.h" - -#endif // CHROME_BROWSER_CHILD_PROCESS_LAUNCHER_H_ diff --git a/chrome/browser/child_process_security_policy.h b/chrome/browser/child_process_security_policy.h deleted file mode 100644 index ce0adf2..0000000 --- a/chrome/browser/child_process_security_policy.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2011 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_BROWSER_CHILD_PROCESS_SECURITY_POLICY_H_ -#define CHROME_BROWSER_CHILD_PROCESS_SECURITY_POLICY_H_ - -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/child_process_security_policy.h" - -#endif // CHROME_BROWSER_CHILD_PROCESS_SECURITY_POLICY_H_ diff --git a/chrome/browser/chrome_blob_storage_context.h b/chrome/browser/chrome_blob_storage_context.h deleted file mode 100644 index ffa74f2..0000000 --- a/chrome/browser/chrome_blob_storage_context.h +++ /dev/null @@ -1,12 +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_BROWSER_CHROME_BLOB_STORAGE_CONTEXT_H_ -#define CHROME_BROWSER_CHROME_BLOB_STORAGE_CONTEXT_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/chrome_blob_storage_context.h" - -#endif // CHROME_BROWSER_CHROME_BLOB_STORAGE_CONTEXT_H_ diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index eaf3b35..fac9282 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -20,13 +20,9 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chrome_plugin_browsing_context.h" #include "chrome/browser/gears_integration.h" -#include "chrome/browser/plugin_process_host.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_counters.h" @@ -39,6 +35,10 @@ #include "chrome/common/notification_service.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" +#include "content/browser/browser_thread.h" +#include "content/browser/plugin_process_host.h" +#include "content/browser/plugin_service.h" +#include "content/browser/renderer_host/render_process_host.h" #include "net/base/cookie_monster.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h index d34f4d5..f6a18c8 100644 --- a/chrome/browser/chromeos/boot_times_loader.h +++ b/chrome/browser/chromeos/boot_times_loader.h @@ -11,9 +11,9 @@ #include "base/atomic_sequence_num.h" #include "base/callback.h" #include "base/time.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/cancelable_request.h" namespace chromeos { diff --git a/chrome/browser/chromeos/cros/syslogs_library.h b/chrome/browser/chromeos/cros/syslogs_library.h index de53694..8006086 100644 --- a/chrome/browser/chromeos/cros/syslogs_library.h +++ b/chrome/browser/chromeos/cros/syslogs_library.h @@ -7,7 +7,7 @@ #pragma once #include "base/singleton.h" -#include "chrome/browser/cancelable_request.h" +#include "content/browser/cancelable_request.h" #include "third_party/cros/chromeos_syslogs.h" class CancelableRequestConsumerBase; diff --git a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc index b2c8c86..0723a96 100644 --- a/chrome/browser/chromeos/gview_request_interceptor_unittest.cc +++ b/chrome/browser/chromeos/gview_request_interceptor_unittest.cc @@ -3,10 +3,11 @@ // found in the LICENSE file. #include <string> + #include "base/message_loop.h" #include "chrome/browser/chromeos/gview_request_interceptor.h" -#include "chrome/browser/plugin_service.h" #include "chrome/common/chrome_paths.h" +#include "content/browser/plugin_service.h" #include "net/base/load_flags.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" diff --git a/chrome/browser/chromeos/login/registration_screen.cc b/chrome/browser/chromeos/login/registration_screen.cc index 617d5b6..3aaf79d 100644 --- a/chrome/browser/chromeos/login/registration_screen.cc +++ b/chrome/browser/chromeos/login/registration_screen.cc @@ -7,13 +7,13 @@ #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/url_constants.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_about_job.h" #include "net/url_request/url_request_filter.h" diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 82b44eb..0ab31ae 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -9,11 +9,11 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/bindings_policy.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/version_loader.h b/chrome/browser/chromeos/version_loader.h index 24da0b5..948f91f 100644 --- a/chrome/browser/chromeos/version_loader.h +++ b/chrome/browser/chromeos/version_loader.h @@ -10,7 +10,7 @@ #include "base/callback.h" #include "base/gtest_prod_util.h" -#include "chrome/browser/cancelable_request.h" +#include "content/browser/cancelable_request.h" class FilePath; diff --git a/chrome/browser/cross_site_request_manager.h b/chrome/browser/cross_site_request_manager.h deleted file mode 100644 index eee1033..0000000 --- a/chrome/browser/cross_site_request_manager.h +++ /dev/null @@ -1,12 +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_BROWSER_CROSS_SITE_REQUEST_MANAGER_H_ -#define CHROME_BROWSER_CROSS_SITE_REQUEST_MANAGER_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/cross_site_request_manager.h" - -#endif // CHROME_BROWSER_CROSS_SITE_REQUEST_MANAGER_H_ diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index 632dd62..20ce34b 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -5,10 +5,10 @@ #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "base/scoped_ptr.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/common/pref_names.h" +#include "content/browser/child_process_security_policy.h" #include "net/url_request/url_request_redirect_job.h" diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc index 7792532..3fc44b5 100644 --- a/chrome/browser/debugger/devtools_manager.cc +++ b/chrome/browser/debugger/devtools_manager.cc @@ -9,20 +9,20 @@ #include "base/auto_reset.h" #include "base/message_loop.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_netlog_observer.h" #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "content/browser/browsing_instance.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/site_instance.h" #include "googleurl/src/gurl.h" // static diff --git a/chrome/browser/disposition_utils.h b/chrome/browser/disposition_utils.h deleted file mode 100644 index 74ae1e0..0000000 --- a/chrome/browser/disposition_utils.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 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_BROWSER_DISPOSITION_UTILS_H_ -#define CHROME_BROWSER_DISPOSITION_UTILS_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/disposition_utils.h" - -#endif // CHROME_BROWSER_DISPOSITION_UTILS_H_ diff --git a/chrome/browser/download/download_history.h b/chrome/browser/download/download_history.h index d7f9188..7fb114e 100644 --- a/chrome/browser/download/download_history.h +++ b/chrome/browser/download/download_history.h @@ -7,8 +7,8 @@ #pragma once #include "base/basictypes.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" +#include "content/browser/cancelable_request.h" class DownloadItem; class Profile; diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc index 13532d7..663fff1 100644 --- a/chrome/browser/extensions/extension_event_router.cc +++ b/chrome/browser/extensions/extension_event_router.cc @@ -5,7 +5,6 @@ #include "chrome/browser/extensions/extension_event_router.h" #include "base/values.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/extensions/extension_devtools_manager.h" #include "chrome/browser/extensions/extension_processes_api.h" #include "chrome/browser/extensions/extension_processes_api_constants.h" @@ -13,10 +12,11 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_webrequest_api.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/renderer_host/render_process_host.h" namespace { diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index c72c9d8..14e98a2 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/chrome/browser/extensions/extension_message_service.cc @@ -8,18 +8,18 @@ #include "base/json/json_writer.h" #include "base/stl_util-inl.h" #include "base/values.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" +#include "content/browser/child_process_security_policy.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" // Since we have 2 ports for every channel, we just index channels by half the // port ID. diff --git a/chrome/browser/fav_icon_helper.h b/chrome/browser/fav_icon_helper.h index 0084979..60fad35 100644 --- a/chrome/browser/fav_icon_helper.h +++ b/chrome/browser/fav_icon_helper.h @@ -11,10 +11,10 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/ref_counted.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon_service.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/common/ref_counted_util.h" +#include "content/browser/cancelable_request.h" +#include "content/browser/tab_contents/tab_contents_observer.h" #include "googleurl/src/gurl.h" class NavigationEntry; diff --git a/chrome/browser/favicon_service.h b/chrome/browser/favicon_service.h index 70c814a..3c0a0e3 100644 --- a/chrome/browser/favicon_service.h +++ b/chrome/browser/favicon_service.h @@ -11,9 +11,9 @@ #include "base/ref_counted.h" #include "base/ref_counted_memory.h" #include "base/task.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" #include "chrome/common/ref_counted_util.h" +#include "content/browser/cancelable_request.h" class GURL; class Profile; diff --git a/chrome/browser/gpu_process_host.h b/chrome/browser/gpu_process_host.h deleted file mode 100644 index 348a6d4..0000000 --- a/chrome/browser/gpu_process_host.h +++ /dev/null @@ -1,12 +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_BROWSER_GPU_PROCESS_HOST_H_ -#define CHROME_BROWSER_GPU_PROCESS_HOST_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/gpu_process_host.h" - -#endif // CHROME_BROWSER_GPU_PROCESS_HOST_H_ diff --git a/chrome/browser/gpu_process_host_ui_shim.cc b/chrome/browser/gpu_process_host_ui_shim.cc index ff7a237..4dcfdb9 100644 --- a/chrome/browser/gpu_process_host_ui_shim.cc +++ b/chrome/browser/gpu_process_host_ui_shim.cc @@ -8,13 +8,13 @@ #include "chrome/browser/gpu_process_host_ui_shim.h" #include "base/id_map.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/gpu_data_manager.h" -#include "chrome/browser/gpu_process_host.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/common/gpu_messages.h" +#include "chrome/browser/gpu_data_manager.h" +#include "content/browser/browser_thread.h" +#include "content/browser/gpu_process_host.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host_view.h" #if defined(OS_LINUX) // These two #includes need to come after gpu_messages.h. diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index 6afe318..ce0d29e 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -16,7 +16,6 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/search_engines/template_url_id.h" @@ -24,6 +23,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/ref_counted_util.h" +#include "content/browser/cancelable_request.h" class BookmarkService; struct DownloadCreateInfo; diff --git a/chrome/browser/history/history_marshaling.h b/chrome/browser/history/history_marshaling.h index 1efd670..b270b74 100644 --- a/chrome/browser/history/history_marshaling.h +++ b/chrome/browser/history/history_marshaling.h @@ -10,10 +10,10 @@ #pragma once #include "base/scoped_vector.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/page_usage_data.h" +#include "content/browser/cancelable_request.h" namespace history { diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h index f92b877..5e3fa14 100644 --- a/chrome/browser/history/top_sites.h +++ b/chrome/browser/history/top_sites.h @@ -18,11 +18,11 @@ #include "base/synchronization/lock.h" #include "base/time.h" #include "base/timer.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/page_usage_data.h" #include "chrome/common/thumbnail_score.h" +#include "content/browser/cancelable_request.h" #include "googleurl/src/gurl.h" class DictionaryValue; diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h index 50d08678..ebd8c6a 100644 --- a/chrome/browser/history/top_sites_backend.h +++ b/chrome/browser/history/top_sites_backend.h @@ -9,8 +9,8 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" +#include "content/browser/cancelable_request.h" class FilePath; diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h index 210fa28..a7a2441 100644 --- a/chrome/browser/icon_manager.h +++ b/chrome/browser/icon_manager.h @@ -50,8 +50,8 @@ #include "base/callback.h" #include "base/hash_tables.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/icon_loader.h" +#include "content/browser/cancelable_request.h" class FilePath; class SkBitmap; diff --git a/chrome/browser/jumplist_win.h b/chrome/browser/jumplist_win.h index 58146d0..b7549d5 100644 --- a/chrome/browser/jumplist_win.h +++ b/chrome/browser/jumplist_win.h @@ -12,10 +12,10 @@ #include <vector> #include "base/ref_counted.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" +#include "content/browser/cancelable_request.h" class FilePath; class Profile; diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index fbf431c..ea5d35f 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -9,25 +9,25 @@ #include "base/process_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_child_process_host.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/backing_store_manager.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/backing_store_manager.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_LINUX) -#include "chrome/browser/zygote_host_linux.h" -#include "chrome/browser/renderer_host/render_sandbox_host_linux.h" +#include "content/browser/zygote_host_linux.h" +#include "content/browser/renderer_host/render_sandbox_host_linux.h" #endif ProcessMemoryInformation::ProcessMemoryInformation() diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc index a5e58b8..9c67966 100644 --- a/chrome/browser/memory_details_linux.cc +++ b/chrome/browser/memory_details_linux.cc @@ -15,11 +15,11 @@ #include "base/string_util.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_child_process_host.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/zygote_host_linux.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" +#include "content/browser/zygote_host_linux.h" #include "grit/chromium_strings.h" // Known browsers which we collect details for. diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index d4d14fd..8b33825 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -15,15 +15,15 @@ #include "base/process_util.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_child_process_host.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/process_info_snapshot.h" -#include "chrome/browser/renderer_host/backing_store_manager.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/backing_store_manager.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 697f608..0e9f063 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -11,13 +11,13 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" -#include "chrome/browser/browser_child_process_host.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/backing_store_manager.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/backing_store_manager.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/mime_registry_message_filter.h b/chrome/browser/mime_registry_message_filter.h deleted file mode 100644 index ef1fefb..0000000 --- a/chrome/browser/mime_registry_message_filter.h +++ /dev/null @@ -1,11 +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_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ -#define CHROME_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/mime_registry_message_filter.h" - -#endif // CHROME_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ diff --git a/chrome/browser/nacl_host/nacl_broker_host_win.h b/chrome/browser/nacl_host/nacl_broker_host_win.h index 27ceb24..f226564 100644 --- a/chrome/browser/nacl_host/nacl_broker_host_win.h +++ b/chrome/browser/nacl_host/nacl_broker_host_win.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "chrome/browser/browser_child_process_host.h" +#include "content/browser/browser_child_process_host.h" class NaClBrokerHost : public BrowserChildProcessHost { public: diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index c54f6ba..46c5468 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -9,8 +9,8 @@ #include "build/build_config.h" #include "base/ref_counted.h" -#include "chrome/browser/browser_child_process_host.h" #include "chrome/common/nacl_types.h" +#include "content/browser/browser_child_process_host.h" class RenderMessageFilter; diff --git a/chrome/browser/net/blob_url_request_job_factory.cc b/chrome/browser/net/blob_url_request_job_factory.cc index 2aaebc7..b8ffc8d 100644 --- a/chrome/browser/net/blob_url_request_job_factory.cc +++ b/chrome/browser/net/blob_url_request_job_factory.cc @@ -4,12 +4,12 @@ #include "chrome/browser/net/blob_url_request_job_factory.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/chrome_blob_storage_context.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/chrome_blob_storage_context.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "webkit/blob/blob_storage_controller.h" #include "webkit/blob/blob_url_request_job.h" diff --git a/chrome/browser/net/view_blob_internals_job_factory.cc b/chrome/browser/net/view_blob_internals_job_factory.cc index ad2349f..c5fffef 100644 --- a/chrome/browser/net/view_blob_internals_job_factory.cc +++ b/chrome/browser/net/view_blob_internals_job_factory.cc @@ -5,8 +5,8 @@ #include "chrome/browser/net/view_blob_internals_job_factory.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/browser/chrome_blob_storage_context.h" #include "chrome/common/url_constants.h" +#include "content/browser/chrome_blob_storage_context.h" #include "net/url_request/url_request.h" #include "webkit/blob/view_blob_internals_job.h" diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 6d7ad40..70f1341 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -7,8 +7,6 @@ #include "base/metrics/histogram.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_child_process_host.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_object_proxy.h" @@ -17,17 +15,19 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_pref_update.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/site_instance.h" +#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/worker_host/worker_process_host.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc index d699053..a287b82 100644 --- a/chrome/browser/oom_priority_manager.cc +++ b/chrome/browser/oom_priority_manager.cc @@ -11,12 +11,12 @@ #include "base/threading/thread.h" #include "build/build_config.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" -#include "chrome/browser/zygote_host_linux.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/zygote_host_linux.h" #if !defined(OS_CHROMEOS) #error This file only meant to be compiled on ChromeOS diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index a605db8..14c53ae 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -10,10 +10,10 @@ #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/cert_store.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/ssl/ssl_manager.h" +#include "content/browser/cert_store.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/cert_status_flags.h" diff --git a/chrome/browser/page_info_model.h b/chrome/browser/page_info_model.h index 3dda092..15b2c79 100644 --- a/chrome/browser/page_info_model.h +++ b/chrome/browser/page_info_model.h @@ -9,9 +9,9 @@ #include <vector> #include "base/string16.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" -#include "chrome/browser/tab_contents/navigation_entry.h" +#include "content/browser/cancelable_request.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "googleurl/src/gurl.h" #include "ui/gfx/image.h" diff --git a/chrome/browser/pdf_unsupported_feature.cc b/chrome/browser/pdf_unsupported_feature.cc index b3710c2..d7e10f1 100644 --- a/chrome/browser/pdf_unsupported_feature.cc +++ b/chrome/browser/pdf_unsupported_feature.cc @@ -8,17 +8,17 @@ #include "base/values.h" #include "base/version.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/interstitial_page.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/pref_names.h" +#include "content/browser/plugin_service.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/interstitial_page.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/plugin_data_remover.cc b/chrome/browser/plugin_data_remover.cc index 5dd9750..39b8019 100644 --- a/chrome/browser/plugin_data_remover.cc +++ b/chrome/browser/plugin_data_remover.cc @@ -8,10 +8,10 @@ #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/version.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/plugin_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/plugin_messages.h" +#include "content/browser/browser_thread.h" +#include "content/browser/plugin_service.h" #include "webkit/plugins/npapi/plugin_group.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/plugin_data_remover.h b/chrome/browser/plugin_data_remover.h index b9842b1..8d11603 100644 --- a/chrome/browser/plugin_data_remover.h +++ b/chrome/browser/plugin_data_remover.h @@ -8,8 +8,7 @@ #include "base/ref_counted.h" #include "base/time.h" -#include "chrome/browser/plugin_process_host.h" -#include "ipc/ipc_channel.h" +#include "content/browser/plugin_process_host.h" class Task; diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h deleted file mode 100644 index bc657bc..0000000 --- a/chrome/browser/plugin_process_host.h +++ /dev/null @@ -1,12 +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_BROWSER_PLUGIN_PROCESS_HOST_H_ -#define CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/plugin_process_host.h" - -#endif // CHROME_BROWSER_PLUGIN_PROCESS_HOST_H_ diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h deleted file mode 100644 index ce56cfb..0000000 --- a/chrome/browser/plugin_service.h +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2011 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_BROWSER_PLUGIN_SERVICE_H_ -#define CHROME_BROWSER_PLUGIN_SERVICE_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/plugin_service.h" -#endif // CHROME_BROWSER_PLUGIN_SERVICE_H_ diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc index ca6276d..c3e0815 100644 --- a/chrome/browser/possible_url_model.cc +++ b/chrome/browser/possible_url_model.cc @@ -8,11 +8,11 @@ #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "content/browser/cancelable_request.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ppapi_plugin_process_host.h b/chrome/browser/ppapi_plugin_process_host.h deleted file mode 100644 index 2a75065..0000000 --- a/chrome/browser/ppapi_plugin_process_host.h +++ /dev/null @@ -1,13 +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_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_ -#define CHROME_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/ppapi_plugin_process_host.h" - -#endif // CHROME_BROWSER_PPAPI_PLUGIN_PROCESS_HOST_H_ - diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h index 6a41742..686a2fb 100644 --- a/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PRINTING_PRINTING_MESSAGE_FILTER_H_ #pragma once -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" #if defined(OS_WIN) #include "base/shared_memory.h" diff --git a/chrome/browser/profile_import_process_host.h b/chrome/browser/profile_import_process_host.h index dae6108..a90bf21 100644 --- a/chrome/browser/profile_import_process_host.h +++ b/chrome/browser/profile_import_process_host.h @@ -11,11 +11,11 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "chrome/browser/browser_child_process_host.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/importer/profile_writer.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" namespace webkit_glue { struct PasswordForm; diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h index ad30cfd..6ef691d 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.h +++ b/chrome/browser/renderer_host/browser_render_process_host.h @@ -16,10 +16,10 @@ #include "base/scoped_callback_factory.h" #include "base/scoped_ptr.h" #include "base/timer.h" -#include "chrome/browser/child_process_launcher.h" -#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/child_process_launcher.h" +#include "content/browser/renderer_host/render_process_host.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" class CommandLine; 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 d46560d..d1a2414 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -19,15 +19,8 @@ #include "base/sys_string_conversions.h" #import "chrome/browser/accessibility/browser_accessibility_cocoa.h" #include "chrome/browser/accessibility/browser_accessibility_state.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_trial.h" -#include "chrome/browser/gpu_process_host.h" #include "chrome/browser/gpu_process_host_ui_shim.h" -#include "chrome/browser/plugin_process_host.h" -#include "chrome/browser/renderer_host/backing_store_mac.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/browser/spellchecker_platform_engine.h" #import "chrome/browser/ui/cocoa/rwhvm_editcommand_helper.h" #import "chrome/browser/ui/cocoa/view_id_util.h" @@ -37,6 +30,13 @@ #include "chrome/common/gpu_messages.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" +#include "content/browser/browser_thread.h" +#include "content/browser/gpu_process_host.h" +#include "content/browser/plugin_process_host.h" +#include "content/browser/renderer_host/backing_store_mac.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.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 45714a2..308d441 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -16,19 +16,19 @@ #include "chrome/browser/accessibility/browser_accessibility_win.h" #include "chrome/browser/accessibility/browser_accessibility_manager.h" #include "chrome/browser/accessibility/browser_accessibility_state.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_trial.h" -#include "chrome/browser/plugin_process_host.h" -#include "chrome/browser/renderer_host/backing_store.h" -#include "chrome/browser/renderer_host/backing_store_win.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" +#include "content/browser/browser_thread.h" +#include "content/browser/plugin_process_host.h" +#include "content/browser/renderer_host/backing_store.h" +#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 "grit/webkit_resources.h" #include "skia/ext/skia_utils_win.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" diff --git a/chrome/browser/search_engines/search_provider_install_state_message_filter.h b/chrome/browser/search_engines/search_provider_install_state_message_filter.h index 63ea44e..3295a60 100644 --- a/chrome/browser/search_engines/search_provider_install_state_message_filter.h +++ b/chrome/browser/search_engines/search_provider_install_state_message_filter.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_MESSAGE_FILTER_H_ #define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_PROVIDER_INSTALL_STATE_MESSAGE_FILTER_H_ -#include "chrome/browser/browser_message_filter.h" #include "chrome/browser/search_engines/search_provider_install_data.h" +#include "content/browser/browser_message_filter.h" class GURL; class Profile; diff --git a/chrome/browser/sessions/base_session_service.h b/chrome/browser/sessions/base_session_service.h index cefe5d0..665fcfd 100644 --- a/chrome/browser/sessions/base_session_service.h +++ b/chrome/browser/sessions/base_session_service.h @@ -10,8 +10,8 @@ #include "base/callback.h" #include "base/file_path.h" #include "base/ref_counted.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/sessions/session_id.h" +#include "content/browser/cancelable_request.h" class NavigationEntry; class Profile; diff --git a/chrome/browser/spellcheck_message_filter.h b/chrome/browser/spellcheck_message_filter.h index d20ff3c..bd4bafc 100644 --- a/chrome/browser/spellcheck_message_filter.h +++ b/chrome/browser/spellcheck_message_filter.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SPELLCHECK_MESSAGE_FILTER_H_ #define CHROME_BROWSER_SPELLCHECK_MESSAGE_FILTER_H_ -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" // A message filter implementation that receives // the platform spell checker requests from SpellCheckProvider. diff --git a/chrome/browser/spellchecker_mac.mm b/chrome/browser/spellchecker_mac.mm index b2af3ec..6b22888 100644 --- a/chrome/browser/spellchecker_mac.mm +++ b/chrome/browser/spellchecker_mac.mm @@ -14,10 +14,10 @@ #include "base/task.h" #include "base/time.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/browser_message_filter.h" #include "chrome/common/render_messages.h" #include "chrome/common/spellcheck_common.h" +#include "content/browser/browser_thread.h" +#include "content/browser/browser_message_filter.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCheckingResult.h" using base::TimeTicks; diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 8d3b315..03ccbe5 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -9,17 +9,17 @@ #include "base/string_piece.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/cert_store.h" #include "chrome/browser/dom_operation_notification_details.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/ssl/ssl_cert_error_handler.h" #include "chrome/browser/ssl/ssl_error_info.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/notification_service.h" +#include "content/browser/cert_store.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/render_view_host.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 "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index ee3df60..3a6c0c2 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ssl/ssl_error_info.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/cert_store.h" #include "chrome/common/time_format.h" +#include "content/browser/cert_store.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/sync/glue/history_model_worker.h b/chrome/browser/sync/glue/history_model_worker.h index bdd0a2c..e449a93 100644 --- a/chrome/browser/sync/glue/history_model_worker.h +++ b/chrome/browser/sync/glue/history_model_worker.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/ref_counted.h" -#include "chrome/browser/cancelable_request.h" +#include "content/browser/cancelable_request.h" class HistoryService; diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.h b/chrome/browser/sync/glue/typed_url_data_type_controller.h index d3892a1..edffa3b 100644 --- a/chrome/browser/sync/glue/typed_url_data_type_controller.h +++ b/chrome/browser/sync/glue/typed_url_data_type_controller.h @@ -10,12 +10,12 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_type.h" +#include "content/browser/cancelable_request.h" class NotificationSource; class NotificationDetails; diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index f439321..a25efa8 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -19,7 +19,6 @@ #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/download/download_manager.h" @@ -33,13 +32,10 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/spellcheck_host.h" #include "chrome/browser/spellchecker_platform_engine.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/translate/translate_prefs.h" #include "chrome/browser/translate/translate_manager.h" #include "chrome/common/chrome_constants.h" @@ -47,6 +43,10 @@ #include "chrome/common/content_restriction.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index 98d0ec4..e8a0485 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -7,14 +7,14 @@ #include "base/basictypes.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ssl/ssl_add_cert_handler.h" #include "chrome/browser/ssl/ssl_client_auth_handler.h" #include "chrome/browser/ssl_client_certificate_selector.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" +#include "content/browser/certificate_viewer.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 2197b33..f9dac2e 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -16,10 +16,8 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background_contents_service.h" -#include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" @@ -27,16 +25,18 @@ #include "chrome/browser/notifications/balloon_host.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/render_message_filter.h" -#include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/background_contents.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "chrome/common/sqlite_utils.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_message_filter.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 "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 1d3c38c..66c99a2 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -59,19 +59,12 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/tab_closeable_state_watcher.h" -#include "chrome/browser/tab_contents/interstitial_page.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/find_bar/find_bar.h" @@ -102,7 +95,14 @@ #include "chrome/common/url_constants.h" #include "chrome/common/web_apps.h" #include "content/browser/host_zoom_map.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/site_instance.h" #include "content/browser/tab_contents/infobar_delegate.h" +#include "content/browser/tab_contents/interstitial_page.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/browser/tab_contents/tab_contents_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" @@ -120,7 +120,6 @@ #if defined(OS_WIN) #include "app/win/shell.h" #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" -#include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ssl/ssl_error_info.h" diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 1da6dea..f5e8ee1 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -22,9 +22,7 @@ #include "chrome/browser/automation/testing_automation_provider.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/defaults.h" #include "chrome/browser/extensions/extension_creator.h" #include "chrome/browser/extensions/extension_service.h" @@ -37,16 +35,12 @@ #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/pinned_tab_codec.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser_navigator.h" @@ -59,6 +53,12 @@ #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" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/renderer_host/render_process_host.h" +#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 "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/cocoa/certificate_viewer.mm b/chrome/browser/ui/cocoa/certificate_viewer.mm index 8c5a954..563eb26 100644 --- a/chrome/browser/ui/cocoa/certificate_viewer.mm +++ b/chrome/browser/ui/cocoa/certificate_viewer.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/certificate_viewer.h" +#include "content/browser/certificate_viewer.h" #include <Security/Security.h> #include <SecurityInterface/SFCertificatePanel.h> diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h index 6ad83a3..159e470 100644 --- a/chrome/browser/ui/cocoa/download/download_item_mac.h +++ b/chrome/browser/ui/cocoa/download/download_item_mac.h @@ -10,10 +10,10 @@ #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/icon_manager.h" +#include "content/browser/cancelable_request.h" class BaseDownloadItemModel; @class DownloadItemController; diff --git a/chrome/browser/ui/cocoa/event_utils.mm b/chrome/browser/ui/cocoa/event_utils.mm index d471398..32ad8f8 100644 --- a/chrome/browser/ui/cocoa/event_utils.mm +++ b/chrome/browser/ui/cocoa/event_utils.mm @@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/event_utils.h" -#include "chrome/browser/disposition_utils.h" +#include "content/browser/disposition_utils.h" namespace event_utils { diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index db4a37b..2e90b1d 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h @@ -11,13 +11,13 @@ #include "base/ref_counted.h" #include "base/scoped_nsobject.h" -#include "chrome/browser/cancelable_request.h" #import "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" #include "chrome/common/notification_observer.h" +#include "content/browser/cancelable_request.h" class NavigationEntry; class NotificationRegistrar; diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm index c292d5c..7491ed2 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm @@ -10,11 +10,11 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/history_menu_bridge.h" +#include "content/browser/cancelable_request.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm index 1108a98..5a883a6 100644 --- a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm @@ -8,8 +8,6 @@ #include "base/sys_string_conversions.h" #include "base/task.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/cert_store.h" -#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/profiles/profile.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -18,6 +16,8 @@ #import "chrome/browser/ui/cocoa/info_bubble_window.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/common/url_constants.h" +#include "content/browser/certificate_viewer.h" +#include "content/browser/cert_store.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/cert_status_flags.h" diff --git a/chrome/browser/ui/gtk/certificate_viewer.h b/chrome/browser/ui/gtk/certificate_viewer.h index c31477c..02c0c0a 100644 --- a/chrome/browser/ui/gtk/certificate_viewer.h +++ b/chrome/browser/ui/gtk/certificate_viewer.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_GTK_CERTIFICATE_VIEWER_H_ #pragma once -#include "chrome/browser/certificate_viewer.h" +#include "content/browser/certificate_viewer.h" #include "net/base/x509_certificate.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index 366d5fc..e2f0df1 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -23,13 +23,13 @@ #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/disposition_utils.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/cairo_cached_surface.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/common/renderer_preferences.h" +#include "content/browser/disposition_utils.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc index f28202f..d543cb0 100644 --- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc @@ -9,7 +9,6 @@ #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/page_info_model.h" #include "chrome/browser/page_info_window.h" @@ -24,6 +23,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" +#include "content/browser/certificate_viewer.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index 4afe254..56a7e2a 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -13,14 +13,14 @@ #include "base/logging.h" #include "base/nss_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ssl/ssl_client_auth_handler.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/common/net/x509_certificate_model.h" +#include "content/browser/certificate_viewer.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc index b8091a3..d2a468a 100644 --- a/chrome/browser/ui/toolbar/toolbar_model.cc +++ b/chrome/browser/ui/toolbar/toolbar_model.cc @@ -7,17 +7,17 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" -#include "chrome/browser/cert_store.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_error_info.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/cert_store.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 "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/cert_status_flags.h" diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc index ba54267..b86cfea 100644 --- a/chrome/browser/ui/views/certificate_viewer_win.cc +++ b/chrome/browser/ui/views/certificate_viewer_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/certificate_viewer.h" +#include "content/browser/certificate_viewer.h" #include <windows.h> #include <cryptuiapi.h> diff --git a/chrome/browser/ui/views/download_item_view.h b/chrome/browser/ui/views/download_item_view.h index 168cc25..a2357c9 100644 --- a/chrome/browser/ui/views/download_item_view.h +++ b/chrome/browser/ui/views/download_item_view.h @@ -23,10 +23,10 @@ #include "base/scoped_ptr.h" #include "base/time.h" #include "base/timer.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/icon_manager.h" +#include "content/browser/cancelable_request.h" #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/font.h" #include "views/events/event.h" diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc index 6e13947..49d0213 100644 --- a/chrome/browser/ui/views/event_utils.cc +++ b/chrome/browser/ui/views/event_utils.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/event_utils.h" -#include "chrome/browser/disposition_utils.h" +#include "content/browser/disposition_utils.h" #include "views/events/event.h" using views::Event; diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index dce2d6b..cd3fcc3 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info_bubble_view.cc @@ -6,13 +6,13 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/cert_store.h" -#include "chrome/browser/certificate_viewer.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/info_bubble.h" #include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/url_constants.h" +#include "content/browser/certificate_viewer.h" +#include "content/browser/cert_store.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/app_launcher_handler.cc b/chrome/browser/ui/webui/app_launcher_handler.cc index 215a8df..3b23bff 100644 --- a/chrome/browser/ui/webui/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/app_launcher_handler.cc @@ -13,13 +13,11 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/disposition_utils.h" #include "chrome/browser/extensions/default_apps.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" @@ -31,6 +29,8 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" +#include "content/browser/disposition_utils.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "ui/base/animation/animation.h" diff --git a/chrome/browser/ui/webui/generic_handler.cc b/chrome/browser/ui/webui/generic_handler.cc index dba7bdb..7bfe8f5 100644 --- a/chrome/browser/ui/webui/generic_handler.cc +++ b/chrome/browser/ui/webui/generic_handler.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "base/values.h" -#include "chrome/browser/disposition_utils.h" -#include "chrome/browser/tab_contents/tab_contents.h" +#include "content/browser/disposition_utils.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" GenericHandler::GenericHandler() { diff --git a/chrome/browser/ui/webui/gpu_internals_ui.cc b/chrome/browser/ui/webui/gpu_internals_ui.cc index 59fd954..dd976bb 100644 --- a/chrome/browser/ui/webui/gpu_internals_ui.cc +++ b/chrome/browser/ui/webui/gpu_internals_ui.cc @@ -19,9 +19,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/gpu_data_manager.h" -#include "chrome/browser/gpu_process_host.h" #include "chrome/browser/gpu_process_host_ui_shim.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/net/chrome_net_log.h" @@ -30,13 +28,15 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/gpu_process_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/ui/webui/history2_ui.h b/chrome/browser/ui/webui/history2_ui.h index 4a7f641..9f7dedf 100644 --- a/chrome/browser/ui/webui/history2_ui.h +++ b/chrome/browser/ui/webui/history2_ui.h @@ -9,10 +9,10 @@ #include <string> #include "base/string16.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/cancelable_request.h" #include "content/browser/webui/web_ui.h" class GURL; diff --git a/chrome/browser/ui/webui/history_ui.h b/chrome/browser/ui/webui/history_ui.h index ee64769..9f609a2 100644 --- a/chrome/browser/ui/webui/history_ui.h +++ b/chrome/browser/ui/webui/history_ui.h @@ -9,10 +9,10 @@ #include <string> #include "base/string16.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/cancelable_request.h" #include "content/browser/webui/web_ui.h" class GURL; diff --git a/chrome/browser/ui/webui/most_visited_handler.h b/chrome/browser/ui/webui/most_visited_handler.h index 1d51b67..93ef57f 100644 --- a/chrome/browser/ui/webui/most_visited_handler.h +++ b/chrome/browser/ui/webui/most_visited_handler.h @@ -9,10 +9,10 @@ #include <string> #include <vector> -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/cancelable_request.h" #include "content/browser/webui/web_ui.h" class DictionaryValue; diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc index 097e691..a7469b8 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc @@ -10,13 +10,12 @@ #include "base/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" // for FileAccessProvider -#include "chrome/browser/certificate_manager_model.h" -#include "chrome/browser/certificate_viewer.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "chrome/browser/ui/gtk/certificate_dialogs.h" +#include "content/browser/browser_thread.h" // for FileAccessProvider +#include "content/browser/certificate_viewer.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.h b/chrome/browser/ui/webui/options/certificate_manager_handler.h index 4ead5be..18757c8 100644 --- a/chrome/browser/ui/webui/options/certificate_manager_handler.h +++ b/chrome/browser/ui/webui/options/certificate_manager_handler.h @@ -9,10 +9,10 @@ #include <string> #include "base/scoped_ptr.h" -#include "chrome/browser/cancelable_request.h" -#include "chrome/browser/certificate_manager_model.h" #include "chrome/browser/ui/shell_dialogs.h" #include "chrome/browser/ui/webui/options/options_ui.h" +#include "content/browser/cancelable_request.h" +#include "content/browser/certificate_manager_model.h" #include "net/base/cert_database.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/utility_process_host.h b/chrome/browser/utility_process_host.h index eaa0771..28484e4 100644 --- a/chrome/browser/utility_process_host.h +++ b/chrome/browser/utility_process_host.h @@ -12,9 +12,9 @@ #include "base/basictypes.h" #include "base/ref_counted.h" #include "base/task.h" -#include "chrome/browser/browser_child_process_host.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/extensions/update_manifest.h" +#include "content/browser/browser_child_process_host.h" +#include "content/browser/browser_thread.h" class DictionaryValue; class IndexedDBKey; diff --git a/chrome/browser/zygote_host_linux.h b/chrome/browser/zygote_host_linux.h deleted file mode 100644 index 1ad9f0e..0000000 --- a/chrome/browser/zygote_host_linux.h +++ /dev/null @@ -1,12 +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_BROWSER_ZYGOTE_HOST_LINUX_H_ -#define CHROME_BROWSER_ZYGOTE_HOST_LINUX_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/zygote_host_linux.h" - -#endif // CHROME_BROWSER_ZYGOTE_HOST_LINUX_H_ diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 26fc191..6dab90b 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -15,10 +15,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/gpu_data_manager.h" -#include "chrome/browser/gpu_process_host.h" #include "chrome/browser/gpu_process_host_ui_shim.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_paths.h" @@ -27,6 +24,9 @@ #include "chrome/test/in_process_browser_test.h" #include "chrome/test/test_launcher_utils.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/gpu_process_host.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 84ab285..788eebe 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -22,12 +22,10 @@ #include "base/threading/platform_thread.h" #include "base/win/scoped_handle.h" #include "chrome/browser/automation/automation_provider_list.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -41,6 +39,8 @@ #include "chrome_frame/test_utils.h" #include "chrome_frame/test/win_event_receiver.h" #include "chrome_frame/utils.h" +#include "content/browser/plugin_service.h" +#include "content/browser/renderer_host/render_process_host.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index ded41be..9de4ccf 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc @@ -23,8 +23,8 @@ #elif defined(OS_LINUX) #include "base/singleton.h" #include "chrome/browser/crash_handler_host_linux.h" -#include "chrome/browser/zygote_host_linux.h" -#include "chrome/browser/renderer_host/render_sandbox_host_linux.h" +#include "content/browser/zygote_host_linux.h" +#include "content/browser/renderer_host/render_sandbox_host_linux.h" #endif #if defined(OS_MACOSX) diff --git a/content/browser/geolocation/access_token_store.h b/content/browser/geolocation/access_token_store.h index 4ef8147..3fbf1c9 100644 --- a/content/browser/geolocation/access_token_store.h +++ b/content/browser/geolocation/access_token_store.h @@ -18,7 +18,7 @@ #include "base/ref_counted.h" #include "base/string16.h" -#include "chrome/browser/cancelable_request.h" +#include "content/browser/cancelable_request.h" #include "googleurl/src/gurl.h" class GURL; diff --git a/content/browser/mime_registry_message_filter.h b/content/browser/mime_registry_message_filter.h index 87b5b24..8342458 100644 --- a/content/browser/mime_registry_message_filter.h +++ b/content/browser/mime_registry_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_MIME_REGISTRY_MESSAGE_FILTER_H_ #include "base/file_path.h" -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" class MimeRegistryMessageFilter : public BrowserMessageFilter { public: diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 6c42164..0cbb756 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -24,7 +24,6 @@ #include "chrome/browser/chrome_plugin_browsing_context.h" #include "chrome/browser/net/url_request_tracking.h" #include "chrome/browser/plugin_download_helper.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_plugin_lib.h" @@ -36,6 +35,7 @@ #include "chrome/common/render_messages_params.h" #include "content/browser/browser_thread.h" #include "content/browser/child_process_security_policy.h" +#include "content/browser/plugin_service.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_message_filter.h" #include "ipc/ipc_switches.h" diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc index 756dbac..f7ca16e 100644 --- a/content/browser/plugin_service.cc +++ b/content/browser/plugin_service.cc @@ -17,7 +17,6 @@ #include "chrome/browser/chrome_plugin_host.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/plugin_updater.h" -#include "chrome/browser/ppapi_plugin_process_host.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/chrome_paths.h" @@ -32,6 +31,7 @@ #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" #include "content/browser/browser_thread.h" +#include "content/browser/ppapi_plugin_process_host.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "webkit/plugins/npapi/plugin_constants_win.h" diff --git a/content/browser/renderer_host/audio_renderer_host.h b/content/browser/renderer_host/audio_renderer_host.h index 128723c..d1d94e9 100644 --- a/content/browser/renderer_host/audio_renderer_host.h +++ b/content/browser/renderer_host/audio_renderer_host.h @@ -60,9 +60,8 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/shared_memory.h" -#include "chrome/browser/browser_message_filter.h" -#include "chrome/browser/browser_thread.h" -#include "ipc/ipc_message.h" +#include "content/browser/browser_message_filter.h" +#include "content/browser/browser_thread.h" #include "media/audio/audio_io.h" #include "media/audio/audio_output_controller.h" #include "media/audio/simple_sources.h" diff --git a/content/browser/renderer_host/blob_message_filter.cc b/content/browser/renderer_host/blob_message_filter.cc index 433fe72..b04cfdb 100644 --- a/content/browser/renderer_host/blob_message_filter.cc +++ b/content/browser/renderer_host/blob_message_filter.cc @@ -4,9 +4,9 @@ #include "content/browser/renderer_host/blob_message_filter.h" -#include "chrome/browser/child_process_security_policy.h" -#include "chrome/browser/chrome_blob_storage_context.h" #include "chrome/common/render_messages.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/chrome_blob_storage_context.h" #include "googleurl/src/gurl.h" #include "webkit/blob/blob_data.h" #include "webkit/blob/blob_storage_controller.h" diff --git a/content/browser/renderer_host/blob_message_filter.h b/content/browser/renderer_host/blob_message_filter.h index aa1cdc6..bb8a191 100644 --- a/content/browser/renderer_host/blob_message_filter.h +++ b/content/browser/renderer_host/blob_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_BLOB_MESSAGE_FILTER_H_ #include "base/hash_tables.h" -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" class ChromeBlobStorageContext; class GURL; diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h index 7d432e8..e5ab22e 100644 --- a/content/browser/renderer_host/database_message_filter.h +++ b/content/browser/renderer_host/database_message_filter.h @@ -8,8 +8,8 @@ #include "base/hash_tables.h" #include "base/string16.h" -#include "chrome/browser/browser_message_filter.h" #include "chrome/common/content_settings.h" +#include "content/browser/browser_message_filter.h" #include "webkit/database/database_connections.h" #include "webkit/database/database_tracker.h" diff --git a/content/browser/renderer_host/file_utilities_message_filter.cc b/content/browser/renderer_host/file_utilities_message_filter.cc index 67377d6..e99f126 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.cc +++ b/content/browser/renderer_host/file_utilities_message_filter.cc @@ -5,8 +5,8 @@ #include "content/browser/renderer_host/file_utilities_message_filter.h" #include "base/file_util.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/common/file_utilities_messages.h" +#include "content/browser/child_process_security_policy.h" FileUtilitiesMessageFilter::FileUtilitiesMessageFilter(int process_id) diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h index 92cd2f5..add9e95 100644 --- a/content/browser/renderer_host/file_utilities_message_filter.h +++ b/content/browser/renderer_host/file_utilities_message_filter.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" #include "ipc/ipc_platform_file.h" namespace base { diff --git a/content/browser/renderer_host/gpu_message_filter.cc b/content/browser/renderer_host/gpu_message_filter.cc index c104f1d..958e04f 100644 --- a/content/browser/renderer_host/gpu_message_filter.cc +++ b/content/browser/renderer_host/gpu_message_filter.cc @@ -9,11 +9,11 @@ #include "chrome/browser/renderer_host/gpu_message_filter.h" #include "base/callback.h" -#include "chrome/browser/gpu_process_host.h" #include "chrome/browser/gpu_process_host_ui_shim.h" #include "chrome/common/gpu_create_command_buffer_config.h" #include "chrome/common/gpu_messages.h" #include "chrome/common/render_messages.h" +#include "content/browser/gpu_process_host.h" GpuMessageFilter::GpuMessageFilter(int render_process_id) : gpu_host_id_(0), diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h index 3618594..625afc6 100644 --- a/content/browser/renderer_host/gpu_message_filter.h +++ b/content/browser/renderer_host/gpu_message_filter.h @@ -6,7 +6,7 @@ #define CONTENT_BROWSER_RENDERER_HOST_GPU_MESSAGE_FILTER_H_ #pragma once -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" struct GPUCreateCommandBufferConfig; class GPUInfo; diff --git a/content/browser/renderer_host/mock_render_process_host.cc b/content/browser/renderer_host/mock_render_process_host.cc index e0a2fb0..84dda0f 100644 --- a/content/browser/renderer_host/mock_render_process_host.cc +++ b/content/browser/renderer_host/mock_render_process_host.cc @@ -4,7 +4,7 @@ #include "content/browser/renderer_host/mock_render_process_host.h" -#include "chrome/browser/child_process_security_policy.h" +#include "content/browser/child_process_security_policy.h" MockRenderProcessHost::MockRenderProcessHost(Profile* profile) : RenderProcessHost(profile), diff --git a/content/browser/renderer_host/pepper_file_message_filter.h b/content/browser/renderer_host/pepper_file_message_filter.h index 24bb1f1..530d9c6 100644 --- a/content/browser/renderer_host/pepper_file_message_filter.h +++ b/content/browser/renderer_host/pepper_file_message_filter.h @@ -14,7 +14,7 @@ #include "base/ref_counted.h" #include "base/task.h" #include "build/build_config.h" -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" #include "ipc/ipc_platform_file.h" #include "webkit/plugins/ppapi/dir_contents.h" diff --git a/content/browser/renderer_host/pepper_message_filter.h b/content/browser/renderer_host/pepper_message_filter.h index 1a1e4da..456fd82 100644 --- a/content/browser/renderer_host/pepper_message_filter.h +++ b/content/browser/renderer_host/pepper_message_filter.h @@ -10,8 +10,7 @@ #include "base/basictypes.h" #include "base/process.h" -#include "chrome/browser/browser_message_filter.h" -#include "ipc/ipc_channel_proxy.h" +#include "content/browser/browser_message_filter.h" #include "ppapi/c/private/ppb_flash_net_connector.h" class Profile; diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index a055122..e7262bb 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -15,8 +15,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/automation/automation_resource_message_filter.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/chrome_plugin_browsing_context.h" #include "chrome/browser/clipboard_dispatcher.h" #include "chrome/browser/download/download_types.h" @@ -29,9 +27,6 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notifications_prefs_cache.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/plugin_process_host.h" -#include "chrome/browser/plugin_service.h" -#include "chrome/browser/ppapi_plugin_process_host.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" #include "chrome/browser/spellchecker_platform_engine.h" @@ -43,7 +38,12 @@ #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/child_process_security_policy.h" #include "content/browser/host_zoom_map.h" +#include "content/browser/plugin_process_host.h" +#include "content/browser/plugin_service.h" +#include "content/browser/ppapi_plugin_process_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/renderer_host/render_view_host_notification_task.h" #include "content/browser/renderer_host/render_widget_helper.h" diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc index f3271fa..113236d 100644 --- a/content/browser/renderer_host/render_process_host.cc +++ b/content/browser/renderer_host/render_process_host.cc @@ -6,11 +6,11 @@ #include "base/rand_util.h" #include "base/sys_info.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/common/child_process_info.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/notification_service.h" #include "content/browser/browser_thread.h" +#include "content/browser/child_process_security_policy.h" namespace { diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index a4238a1..d3ad489 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -26,7 +26,6 @@ #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/net/url_request_tracking.h" -#include "chrome/browser/plugin_service.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_resource_handler.h" #include "chrome/browser/profiles/profile.h" @@ -47,6 +46,7 @@ #include "content/browser/chrome_blob_storage_context.h" #include "content/browser/cross_site_request_manager.h" #include "content/browser/in_process_webkit/webkit_thread.h" +#include "content/browser/plugin_service.h" #include "content/browser/renderer_host/async_resource_handler.h" #include "content/browser/renderer_host/buffered_resource_handler.h" #include "content/browser/renderer_host/cross_site_resource_handler.h" diff --git a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc index e68c3b9..0199b11 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_unittest.cc @@ -7,12 +7,12 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/process_util.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/common/chrome_plugin_lib.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/resource_response.h" +#include "content/browser/browser_thread.h" +#include "content/browser/child_process_security_policy.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/renderer_host/resource_handler.h" diff --git a/content/browser/renderer_host/resource_message_filter.h b/content/browser/renderer_host/resource_message_filter.h index 7e8fb93..8873664 100644 --- a/content/browser/renderer_host/resource_message_filter.h +++ b/content/browser/renderer_host/resource_message_filter.h @@ -6,8 +6,8 @@ #define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_MESSAGE_FILTER_H_ #include "base/scoped_ptr.h" -#include "chrome/browser/browser_message_filter.h" #include "chrome/common/child_process_info.h" +#include "content/browser/browser_message_filter.h" class ChromeURLRequestContext; class ResourceDispatcherHost; diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.h b/content/browser/renderer_host/socket_stream_dispatcher_host.h index 0089e0c..e97527a 100644 --- a/content/browser/renderer_host/socket_stream_dispatcher_host.h +++ b/content/browser/renderer_host/socket_stream_dispatcher_host.h @@ -9,7 +9,7 @@ #include <vector> #include "base/id_map.h" -#include "chrome/browser/browser_message_filter.h" +#include "content/browser/browser_message_filter.h" #include "content/browser/renderer_host/resource_message_filter.h" #include "net/socket_stream/socket_stream.h" |