diff options
111 files changed, 196 insertions, 197 deletions
diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index b42a359..af6a054 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -18,18 +18,18 @@ #include "chrome/browser/app_icon_win.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/backing_store.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/backing_store.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/background_mode_manager_win.cc b/chrome/browser/background_mode_manager_win.cc index a957493..4c9a59f 100644 --- a/chrome/browser/background_mode_manager_win.cc +++ b/chrome/browser/background_mode_manager_win.cc @@ -10,8 +10,8 @@ #include "base/task.h" #include "base/win/registry.h" #include "chrome/browser/background_mode_manager.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_switches.h" +#include "content/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/browser_process_sub_thread.h b/chrome/browser/browser_process_sub_thread.h index 011cdf0..e46325b 100644 --- a/chrome/browser/browser_process_sub_thread.h +++ b/chrome/browser/browser_process_sub_thread.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" class NotificationService; diff --git a/chrome/browser/browser_signin.cc b/chrome/browser/browser_signin.cc index 9fab11f..587ddb9 100644 --- a/chrome/browser/browser_signin.cc +++ b/chrome/browser/browser_signin.cc @@ -13,13 +13,10 @@ #include "base/singleton.h" #include "base/string_util.h" #include "base/values.h" -#include "chrome/browser/browser_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/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_setup_flow.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/constrained_html_ui.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" @@ -29,6 +26,9 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui_util.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data_appcache_helper.cc index 388b98b..7cd83c9 100644 --- a/chrome/browser/browsing_data_appcache_helper.cc +++ b/chrome/browser/browsing_data_appcache_helper.cc @@ -4,10 +4,10 @@ #include "chrome/browser/browsing_data_appcache_helper.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" #include "webkit/appcache/appcache_database.h" #include "webkit/appcache/appcache_storage.h" diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data_database_helper.cc index 239a795..68d1bbc 100644 --- a/chrome/browser/browsing_data_database_helper.cc +++ b/chrome/browser/browsing_data_database_helper.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" +#include "content/browser/browser_thread.h" #include "net/base/net_errors.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc index 9d2c85f..cd589a3 100644 --- a/chrome/browser/browsing_data_database_helper_browsertest.cc +++ b/chrome/browser/browsing_data_database_helper_browsertest.cc @@ -6,10 +6,10 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browsing_data_database_helper.h" #include "chrome/browser/browsing_data_helper_browsertest.h" -#include "chrome/browser/browser_thread.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/testing_profile.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" namespace { typedef BrowsingDataHelperCallback<BrowsingDataDatabaseHelper::DatabaseInfo> diff --git a/chrome/browser/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data_local_storage_helper.cc index 2b81f15..5ce2d8c 100644 --- a/chrome/browser/browsing_data_local_storage_helper.cc +++ b/chrome/browser/browsing_data_local_storage_helper.cc @@ -8,8 +8,8 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" +#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/webkit_context.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h" diff --git a/chrome/browser/chrome_plugin_browsing_context.cc b/chrome/browser/chrome_plugin_browsing_context.cc index ff20485..a1d02f3 100644 --- a/chrome/browser/chrome_plugin_browsing_context.cc +++ b/chrome/browser/chrome_plugin_browsing_context.cc @@ -6,8 +6,8 @@ #include "base/message_loop.h" #include "base/singleton.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/notification_service.h" +#include "content/browser/browser_thread.h" CPBrowsingContextManager* CPBrowsingContextManager::GetInstance() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); diff --git a/chrome/browser/chromeos/cros/mock_mount_library.cc b/chrome/browser/chromeos/cros/mock_mount_library.cc index 615f790..53c4f70 100644 --- a/chrome/browser/chromeos/cros/mock_mount_library.cc +++ b/chrome/browser/chromeos/cros/mock_mount_library.cc @@ -6,8 +6,8 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cros_library.h" +#include "content/browser/browser_thread.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/mock_authenticator.h b/chrome/browser/chromeos/login/mock_authenticator.h index 320ddcf..4816442 100644 --- a/chrome/browser/chromeos/login/mock_authenticator.h +++ b/chrome/browser/chromeos/login/mock_authenticator.h @@ -8,11 +8,11 @@ #include <string> -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/login/authenticator.h" #include "chrome/browser/chromeos/login/background_view.h" #include "chrome/browser/chromeos/login/login_utils.h" #include "chrome/common/net/gaia/google_service_auth_error.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class Profile; diff --git a/chrome/browser/chromeos/network_state_notifier_browsertest.cc b/chrome/browser/chromeos/network_state_notifier_browsertest.cc index 35490a4..9c8c034 100644 --- a/chrome/browser/chromeos/network_state_notifier_browsertest.cc +++ b/chrome/browser/chromeos/network_state_notifier_browsertest.cc @@ -4,12 +4,12 @@ #include "chrome/browser/chromeos/network_state_notifier.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc index 44ae936..d10980f 100644 --- a/chrome/browser/crash_upload_list.cc +++ b/chrome/browser/crash_upload_list.cc @@ -9,9 +9,8 @@ #include "base/file_util.h" #include "base/string_number_conversions.h" #include "base/string_split.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_paths.h" - +#include "content/browser/browser_thread.h" CrashUploadList::CrashInfo::CrashInfo(const std::string& c, const base::Time& t) : crash_id(c), crash_time(t) {} diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc index 43ac93b..7e70ec5 100644 --- a/chrome/browser/debugger/devtools_http_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc @@ -12,14 +12,14 @@ #include "base/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/net/url_request_context_getter.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/server/http_server_request_info.h" @@ -296,7 +296,7 @@ void DevToolsHttpProtocolHandler::OnWebSocketMessageUI( DevToolsManager* manager = DevToolsManager::GetInstance(); - //TODO(pfeldman): remove this once front-end stops sending it upstream. + // TODO(pfeldman): remove this once front-end stops sending it upstream. if (data == "loaded") return; diff --git a/chrome/browser/debugger/devtools_protocol_handler.cc b/chrome/browser/debugger/devtools_protocol_handler.cc index 0024164..4ad52c9 100644 --- a/chrome/browser/debugger/devtools_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_protocol_handler.cc @@ -5,13 +5,13 @@ #include "chrome/browser/debugger/devtools_protocol_handler.h" #include "base/logging.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/debugger/inspectable_tab_proxy.h" #include "chrome/browser/debugger/debugger_remote_service.h" #include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/devtools_remote_listen_socket.h" #include "chrome/browser/debugger/devtools_remote_service.h" #include "chrome/browser/debugger/extension_ports_remote_service.h" +#include "content/browser/browser_thread.h" // static scoped_refptr<DevToolsProtocolHandler> DevToolsProtocolHandler::Start( diff --git a/chrome/browser/enumerate_modules_model_win.h b/chrome/browser/enumerate_modules_model_win.h index 4364bb6..73b7dab 100644 --- a/chrome/browser/enumerate_modules_model_win.h +++ b/chrome/browser/enumerate_modules_model_win.h @@ -14,7 +14,7 @@ #include "base/singleton.h" #include "base/string16.h" #include "base/timer.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" class EnumerateModulesModel; diff --git a/chrome/browser/extensions/autoupdate_interceptor.cc b/chrome/browser/extensions/autoupdate_interceptor.cc index 7f90a10..441ef8b 100644 --- a/chrome/browser/extensions/autoupdate_interceptor.cc +++ b/chrome/browser/extensions/autoupdate_interceptor.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "net/url_request/url_request_test_job.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index d5dc39b..5a72806 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -5,7 +5,6 @@ #include <vector> #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -13,6 +12,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index ea22b69..0c30301 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc @@ -4,7 +4,7 @@ #include "chrome/browser/icon_loader.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" #if defined(TOOLKIT_GTK) diff --git a/chrome/browser/jankometer.cc b/chrome/browser/jankometer.cc index 29986ea..4da5751 100644 --- a/chrome/browser/jankometer.cc +++ b/chrome/browser/jankometer.cc @@ -18,8 +18,8 @@ #include "base/time.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_switches.h" +#include "content/browser/browser_thread.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 438c9e7..ff7756a 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -21,7 +21,6 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/page_usage_data.h" @@ -32,6 +31,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/plugin_data_remover_helper.cc b/chrome/browser/plugin_data_remover_helper.cc index 7b05fc3..7bf3693 100644 --- a/chrome/browser/plugin_data_remover_helper.cc +++ b/chrome/browser/plugin_data_remover_helper.cc @@ -7,11 +7,11 @@ #include <string> #include "base/ref_counted.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/plugin_data_remover.h" #include "chrome/common/notification_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" +#include "content/browser/browser_thread.h" // The internal class is refcounted so it can outlive PluginDataRemoverHelper. class PluginDataRemoverHelper::Internal diff --git a/chrome/browser/plugin_updater.cc b/chrome/browser/plugin_updater.cc index f86637b..2105d1c 100644 --- a/chrome/browser/plugin_updater.cc +++ b/chrome/browser/plugin_updater.cc @@ -12,13 +12,13 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_service.h" #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/pref_names.h" +#include "content/browser/browser_thread.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/plugins/npapi/webplugininfo.h" diff --git a/chrome/browser/power_save_blocker_common.cc b/chrome/browser/power_save_blocker_common.cc index 7fc9fa1..9fcfd7e 100644 --- a/chrome/browser/power_save_blocker_common.cc +++ b/chrome/browser/power_save_blocker_common.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/power_save_blocker.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" // Accessed only from the UI thread. int PowerSaveBlocker::blocker_count_ = 0; diff --git a/chrome/browser/power_save_blocker_win.cc b/chrome/browser/power_save_blocker_win.cc index eb0f352..318aa99 100644 --- a/chrome/browser/power_save_blocker_win.cc +++ b/chrome/browser/power_save_blocker_win.cc @@ -6,7 +6,7 @@ #include <windows.h> -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" // Runs on UI thread only. void PowerSaveBlocker::ApplyBlock(bool blocking) { diff --git a/chrome/browser/printing/print_dialog_cloud_uitest.cc b/chrome/browser/printing/print_dialog_cloud_uitest.cc index fc63237..454f706 100644 --- a/chrome/browser/printing/print_dialog_cloud_uitest.cc +++ b/chrome/browser/printing/print_dialog_cloud_uitest.cc @@ -15,15 +15,15 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/printing/cloud_print/cloud_print_url.h" -#include "chrome/browser/renderer_host/render_view_host.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/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "net/url_request/url_request_filter.h" #include "net/url_request/url_request_test_job.h" #include "net/url_request/url_request_test_util.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index ecab767..fcbf9a9 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -8,21 +8,21 @@ // they work. #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.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/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/malware_details.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" // A SafeBrowingService class that allows us to inject the malicious URLs. class FakeSafeBrowsingService : public SafeBrowsingService { diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 4bff659..5808f0e 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -11,18 +11,18 @@ #include "base/ref_counted.h" #include "base/sha2.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/safe_browsing/protocol_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/safe_browsing/protocol_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" using base::Histogram; using base::StatisticsRecorder; diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index d921026..e17cbd5 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -28,14 +28,14 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/protocol_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" #include "base/test/test_timeouts.h" #include "chrome/test/ui_test_utils.h" #include "net/base/host_resolver.h" diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index ad0106d..a20814b 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -9,11 +9,11 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "content/browser/browser_thread.h" ShellIntegration::ShortcutInfo::ShortcutInfo() : create_on_desktop(false), diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 470a9535..ddfa8dd 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -19,7 +19,6 @@ #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/windows_version.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" @@ -32,6 +31,7 @@ #include "chrome/installer/util/util_constants.h" #include "chrome/installer/util/work_item.h" #include "chrome/installer/util/work_item_list.h" +#include "content/browser/browser_thread.h" namespace { diff --git a/chrome/browser/spellcheck_host.h b/chrome/browser/spellcheck_host.h index 1f09b35..2ea764b 100644 --- a/chrome/browser/spellcheck_host.h +++ b/chrome/browser/spellcheck_host.h @@ -13,8 +13,8 @@ #include "base/platform_file.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/net/url_fetcher.h" +#include "content/browser/browser_thread.h" class Profile; class SpellCheckHostObserver; diff --git a/chrome/browser/sync/sessions/sync_session_context.cc b/chrome/browser/sync/sessions/sync_session_context.cc index 6b0e91e..b5f072b 100644 --- a/chrome/browser/sync/sessions/sync_session_context.cc +++ b/chrome/browser/sync/sessions/sync_session_context.cc @@ -4,9 +4,9 @@ #include "chrome/browser/sync/sessions/sync_session_context.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/sync/util/extensions_activity_monitor.h" #include "chrome/browser/sync/sessions/session_state.h" +#include "content/browser/browser_thread.h" namespace browser_sync { namespace sessions { diff --git a/chrome/browser/sync/util/extensions_activity_monitor.cc b/chrome/browser/sync/util/extensions_activity_monitor.cc index 8c7a52a..1048ee2 100644 --- a/chrome/browser/sync/util/extensions_activity_monitor.cc +++ b/chrome/browser/sync/util/extensions_activity_monitor.cc @@ -5,10 +5,10 @@ #include "chrome/browser/sync/util/extensions_activity_monitor.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_bookmarks_module.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" +#include "content/browser/browser_thread.h" namespace browser_sync { diff --git a/chrome/browser/tab_contents/web_drag_source_win.cc b/chrome/browser/tab_contents/web_drag_source_win.cc index ecad8fc..9d771a4 100644 --- a/chrome/browser/tab_contents/web_drag_source_win.cc +++ b/chrome/browser/tab_contents/web_drag_source_win.cc @@ -5,12 +5,12 @@ #include "chrome/browser/tab_contents/web_drag_source_win.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/web_drag_utils_win.h" #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" using WebKit::WebDragOperationNone; diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 1f113b7..0c652b5 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -14,18 +14,18 @@ #include "base/utf_string_conversions.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/net/url_request_tracking.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/resource_dispatcher_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/task_manager/task_manager_resource_providers.h" #include "chrome/common/pref_names.h" #include "chrome/common/result_codes.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_process_host.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 7982e42..71c6116 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -9,8 +9,8 @@ #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "content/browser/browser_thread.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "net/base/file_stream.h" diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index 5a9b98a..f07b1dd 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/ref_counted.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/extensions/extension.h" +#include "content/browser/browser_thread.h" #include "ui/gfx/color_utils.h" class DictionaryValue; diff --git a/chrome/browser/transport_security_persister.cc b/chrome/browser/transport_security_persister.cc index 715b9e7..c236aed 100644 --- a/chrome/browser/transport_security_persister.cc +++ b/chrome/browser/transport_security_persister.cc @@ -8,8 +8,8 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_paths.h" +#include "content/browser/browser_thread.h" #include "net/base/transport_security_state.h" TransportSecurityPersister::TransportSecurityPersister() diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm index 729ce1c..02dc33d 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm @@ -14,10 +14,10 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/ssl/ssl_client_auth_handler.h" -#include "chrome/browser/tab_contents/tab_contents.h" #import "chrome/browser/ui/cocoa/constrained_window_mac.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc index d0b1357..e2b6bb3 100644 --- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc @@ -7,7 +7,7 @@ #include <pk11pub.h> #include "base/logging.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc index 5dc25a2..d3151c7 100644 --- a/chrome/browser/ui/gtk/certificate_dialogs.cc +++ b/chrome/browser/ui/gtk/certificate_dialogs.cc @@ -14,8 +14,8 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/net/x509_certificate_model.h" +#include "content/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.cc b/chrome/browser/ui/gtk/constrained_window_gtk.cc index 5299d0b..2a454ce 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.cc +++ b/chrome/browser/ui/gtk/constrained_window_gtk.cc @@ -7,9 +7,9 @@ #include <gdk/gdkkeysyms.h> #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_util.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #if defined(TOUCH_UI) #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index c650d86..090a6aa 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -8,14 +8,14 @@ #include "base/environment.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/shell_integration.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h index b8e2957..bfd8880 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.h @@ -8,9 +8,9 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/shell_integration.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc index d36146b..9c7c1d0 100644 --- a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc +++ b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc @@ -11,8 +11,8 @@ #include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/ui/gtk/gtk_util.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/dialogs_gtk.cc b/chrome/browser/ui/gtk/dialogs_gtk.cc index 78f9204..5c18ddb 100644 --- a/chrome/browser/ui/gtk/dialogs_gtk.cc +++ b/chrome/browser/ui/gtk/dialogs_gtk.cc @@ -14,8 +14,8 @@ #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/ui/shell_dialogs.h" +#include "content/browser/browser_thread.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc index 3a64e20..b1a37bd 100644 --- a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc +++ b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc @@ -5,12 +5,12 @@ #include "chrome/browser/ui/gtk/repost_form_warning_gtk.h" #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/repost_form_warning_controller.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_type.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index d8ac169..ad053dc 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -9,18 +9,18 @@ #include "base/command_line.h" #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/password_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_view_host_delegate.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "chrome/browser/tab_contents/constrained_window.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/notification_service.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/renderer_host/render_view_host_delegate.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/auth.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index bc52d66..8ef05e5 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -7,14 +7,14 @@ #include <map> #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/login/login_prompt.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_service.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" #include "net/base/auth.h" namespace { diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc index 990ab1f..6abf6dc 100644 --- a/chrome/browser/ui/login/login_prompt_gtk.cc +++ b/chrome/browser/ui/login/login_prompt_gtk.cc @@ -7,17 +7,17 @@ #include <gtk/gtk.h> #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/login/login_model.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/resource_dispatcher_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_delegate.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/login/login_prompt_mac.mm b/chrome/browser/ui/login/login_prompt_mac.mm index 6036831..4899089 100644 --- a/chrome/browser/ui/login/login_prompt_mac.mm +++ b/chrome/browser/ui/login/login_prompt_mac.mm @@ -9,14 +9,14 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/login/login_model.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc index 019679c..d65d764 100644 --- a/chrome/browser/ui/login/login_prompt_win.cc +++ b/chrome/browser/ui/login/login_prompt_win.cc @@ -5,16 +5,16 @@ #include "chrome/browser/ui/login/login_prompt.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/password_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/resource_dispatcher_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/views/login_view.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/renderer_host/resource_dispatcher_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_delegate.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index 4ea81b7..0aa3970 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -13,14 +13,14 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/browser/ui/webui/html_dialog_ui.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc index ea5c594..0fa87c7 100644 --- a/chrome/browser/ui/views/shell_dialogs_win.cc +++ b/chrome/browser/ui/views/shell_dialogs_win.cc @@ -20,7 +20,7 @@ #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "base/win/windows_version.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "grit/app_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index 2590c69..bbc1476 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -15,16 +15,16 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/download/drag_download_file.h" #include "chrome/browser/download/drag_download_util.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/web_drag_source_win.h" #include "chrome/browser/tab_contents/web_drag_utils_win.h" #include "chrome/browser/tab_contents/web_drop_target_win.h" #include "chrome/browser/ui/views/tab_contents/tab_contents_view_win.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "net/base/net_util.h" #include "views/drag_utils.h" #include "webkit/glue/webdropdata.h" diff --git a/chrome/browser/ui/webui/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks_ui.cc index 8603f7c..4b463d3 100644 --- a/chrome/browser/ui/webui/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks_ui.cc @@ -7,11 +7,11 @@ #include "base/message_loop.h" #include "base/ref_counted_memory.h" #include "base/singleton.h" -#include "chrome/browser/browser_thread.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/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc index 700c5cc..537574c 100644 --- a/chrome/browser/ui/webui/bug_report_ui.cc +++ b/chrome/browser/ui/webui/bug_report_ui.cc @@ -17,7 +17,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/weak_ptr.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/bug_report_data.h" #include "chrome/browser/bug_report_util.h" #include "chrome/browser/profiles/profile.h" @@ -30,6 +29,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc index 4127d68..c48129b 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager.cc @@ -12,10 +12,10 @@ #include "base/string_util.h" #include "base/synchronization/lock.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h" +#include "content/browser/browser_thread.h" #include "grit/platform_locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.h b/chrome/browser/ui/webui/chrome_url_data_manager.h index f0f2580..3043f9d9 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.h +++ b/chrome/browser/ui/webui/chrome_url_data_manager.h @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" class ChromeURLDataManagerBackend; class DictionaryValue; diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 49a9fc0..32e03af 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -15,17 +15,17 @@ #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/download/download_history.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/metrics/user_metrics.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/browser/ui/webui/fileicon_source.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/ui/webui/downloads_ui.cc b/chrome/browser/ui/webui/downloads_ui.cc index 54e6c49..fd2d105 100644 --- a/chrome/browser/ui/webui/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads_ui.cc @@ -8,15 +8,15 @@ #include "base/string_piece.h" #include "base/threading/thread.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/defaults.h" #include "chrome/browser/download/download_manager.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/browser/ui/webui/downloads_dom_handler.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/filebrowse_ui.cc b/chrome/browser/ui/webui/filebrowse_ui.cc index a20d575..c4afc31 100644 --- a/chrome/browser/ui/webui/filebrowse_ui.cc +++ b/chrome/browser/ui/webui/filebrowse_ui.cc @@ -22,14 +22,12 @@ #include "base/values.h" #include "base/weak_ptr.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -43,6 +41,8 @@ #include "chrome/common/net/url_fetcher.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc index e861ad1..a196f83 100644 --- a/chrome/browser/ui/webui/flags_ui.cc +++ b/chrome/browser/ui/webui/flags_ui.cc @@ -11,14 +11,14 @@ #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.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/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/history2_ui.cc b/chrome/browser/ui/webui/history2_ui.cc index edc3eb5..4b6e2ed 100644 --- a/chrome/browser/ui/webui/history2_ui.cc +++ b/chrome/browser/ui/webui/history2_ui.cc @@ -19,12 +19,9 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/webui/favicon_source.h" @@ -32,6 +29,9 @@ #include "chrome/common/notification_source.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc index 7155cde..6699b18 100644 --- a/chrome/browser/ui/webui/history_ui.cc +++ b/chrome/browser/ui/webui/history_ui.cc @@ -19,12 +19,9 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/webui/favicon_source.h" @@ -32,6 +29,9 @@ #include "chrome/common/notification_source.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/keyboard_ui.cc b/chrome/browser/ui/webui/keyboard_ui.cc index 5c15836..2957f92 100644 --- a/chrome/browser/ui/webui/keyboard_ui.cc +++ b/chrome/browser/ui/webui/keyboard_ui.cc @@ -7,11 +7,11 @@ #include "base/ref_counted_memory.h" #include "base/singleton.h" #include "base/string_piece.h" -#include "chrome/browser/browser_thread.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/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "ui/base/resource/resource_bundle.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/webui/mediaplayer_ui.cc b/chrome/browser/ui/webui/mediaplayer_ui.cc index ee77f25..7fceacc 100644 --- a/chrome/browser/ui/webui/mediaplayer_ui.cc +++ b/chrome/browser/ui/webui/mediaplayer_ui.cc @@ -16,13 +16,11 @@ #include "base/values.h" #include "base/weak_ptr.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -34,6 +32,8 @@ #include "chrome/common/net/url_fetcher.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/most_visited_handler.cc b/chrome/browser/ui/webui/most_visited_handler.cc index 6aa4ce5..b1d5ab0 100644 --- a/chrome/browser/ui/webui/most_visited_handler.cc +++ b/chrome/browser/ui/webui/most_visited_handler.cc @@ -16,7 +16,6 @@ #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/page_usage_data.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/metrics/user_metrics.h" @@ -29,6 +28,7 @@ #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals_ui.cc index b57708f..9463c62f 100644 --- a/chrome/browser/ui/webui/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals_ui.cc @@ -20,7 +20,6 @@ #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/io_thread.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/net/connection_tester.h" @@ -28,8 +27,6 @@ #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/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/shell_dialogs.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/chrome_paths.h" @@ -37,6 +34,9 @@ #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/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/generated_resources.h" #include "grit/net_internals_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/ui/webui/new_tab_ui.cc b/chrome/browser/ui/webui/new_tab_ui.cc index 319f6ae..c7eb5a4 100644 --- a/chrome/browser/ui/webui/new_tab_ui.cc +++ b/chrome/browser/ui/webui/new_tab_ui.cc @@ -16,16 +16,13 @@ #include "base/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/metrics/user_metrics.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/sessions/session_types.h" #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/webui/app_launcher_handler.h" @@ -43,6 +40,9 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.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/webui/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp_resource_cache.cc index c0636c7..69c5ac0 100644 --- a/chrome/browser/ui/webui/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp_resource_cache.cc @@ -15,7 +15,6 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -31,6 +30,7 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc index cf92cdb..00b8d82 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc @@ -11,10 +11,10 @@ #include "base/nix/xdg_util.h" #include "base/process_util.h" #include "base/string_tokenizer.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/process_watcher.h" +#include "chrome/browser/browser_list.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "ui/base/gtk/gtk_signal.h" // Command used to configure GNOME proxy settings. The command was renamed diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index a64f2d4..6536d3c 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -11,7 +11,6 @@ #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/custom_home_pages_table_model.h" #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/metrics/user_metrics.h" @@ -27,6 +26,7 @@ #include "chrome/browser/ui/webui/options/options_managed_banner_handler.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/browser_distribution.h" +#include "content/browser/browser_thread.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/font_settings_fonts_list_loader.cc b/chrome/browser/ui/webui/options/font_settings_fonts_list_loader.cc index d51d86e..1f080f3 100644 --- a/chrome/browser/ui/webui/options/font_settings_fonts_list_loader.cc +++ b/chrome/browser/ui/webui/options/font_settings_fonts_list_loader.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/options/font_settings_fonts_list_loader.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/ui/webui/options/font_settings_utils.h" +#include "content/browser/browser_thread.h" FontSettingsFontsListLoader::FontSettingsFontsListLoader(Observer* observer) : observer_(observer) { diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 22d68d4..64ec34d 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -17,12 +17,8 @@ #include "base/time.h" #include "base/values.h" #include "chrome/browser/browser_about_handler.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/metrics/user_metrics.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/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/webui/options/about_page_handler.h" #include "chrome/browser/ui/webui/options/add_startup_page_handler.h" #include "chrome/browser/ui/webui/options/advanced_options_handler.h" @@ -45,6 +41,10 @@ #include "chrome/common/notification_type.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/plugins_ui.cc b/chrome/browser/ui/webui/plugins_ui.cc index f5ed6b7..b585441 100644 --- a/chrome/browser/ui/webui/plugins_ui.cc +++ b/chrome/browser/ui/webui/plugins_ui.cc @@ -13,12 +13,10 @@ #include "base/singleton.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/plugin_updater.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.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_window.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" @@ -28,6 +26,8 @@ #include "chrome/common/pepper_plugin_registry.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview_ui.cc index a9d8511..f116ac7 100644 --- a/chrome/browser/ui/webui/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview_ui.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/webui/print_preview_ui.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/print_preview_handler.h" #include "chrome/browser/ui/webui/print_preview_ui_html_source.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" PrintPreviewUI::PrintPreviewUI(TabContents* contents) : WebUI(contents), diff --git a/chrome/browser/ui/webui/remoting_ui.cc b/chrome/browser/ui/webui/remoting_ui.cc index f11642f..2d3d47b 100644 --- a/chrome/browser/ui/webui/remoting_ui.cc +++ b/chrome/browser/ui/webui/remoting_ui.cc @@ -5,11 +5,11 @@ #include "chrome/browser/ui/webui/remoting_ui.h" #include "base/singleton.h" -#include "chrome/browser/browser_thread.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/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 6c1269c..87a83a3 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -9,9 +9,9 @@ #include "base/ref_counted_memory.h" #include "base/synchronization/waitable_event.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" static const char kCurrentScreenshot[] = "current"; #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc index dbcf43f..80d76e4 100644 --- a/chrome/browser/ui/webui/shared_resources_data_source.cc +++ b/chrome/browser/ui/webui/shared_resources_data_source.cc @@ -8,10 +8,10 @@ #include "base/singleton.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/shared_resources.h" diff --git a/chrome/browser/ui/webui/slideshow_ui.cc b/chrome/browser/ui/webui/slideshow_ui.cc index 39e139e..caa2420 100644 --- a/chrome/browser/ui/webui/slideshow_ui.cc +++ b/chrome/browser/ui/webui/slideshow_ui.cc @@ -15,7 +15,6 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/weak_ptr.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" @@ -24,6 +23,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc index 3a17d6f..30e4bd1 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.cc +++ b/chrome/browser/ui/webui/sync_internals_ui.cc @@ -11,7 +11,6 @@ #include "base/task.h" #include "base/tracked_objects.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/js_arg_list.h" #include "chrome/browser/sync/js_frontend.h" @@ -20,6 +19,7 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/sync_internals_html_source.h" #include "chrome/common/render_messages_params.h" +#include "content/browser/browser_thread.h" SyncInternalsUI::SyncInternalsUI(TabContents* contents) : WebUI(contents) { diff --git a/chrome/browser/ui/webui/textfields_ui.cc b/chrome/browser/ui/webui/textfields_ui.cc index 73217e0..1ca5b1e 100644 --- a/chrome/browser/ui/webui/textfields_ui.cc +++ b/chrome/browser/ui/webui/textfields_ui.cc @@ -10,11 +10,11 @@ #include "base/singleton.h" #include "base/string_piece.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index de02260..1572017 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -6,12 +6,12 @@ #include "base/message_loop.h" #include "base/ref_counted_memory.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/resources_util.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/webui/ntp_resource_cache.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc index 5588d4f..90b65fd 100644 --- a/chrome/browser/upgrade_detector.cc +++ b/chrome/browser/upgrade_detector.cc @@ -14,7 +14,6 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_switches.h" @@ -23,6 +22,7 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/browser_distribution.h" +#include "content/browser/browser_thread.h" #if defined(OS_WIN) #include "chrome/installer/util/install_util.h" diff --git a/chrome/browser/user_style_sheet_watcher.h b/chrome/browser/user_style_sheet_watcher.h index bbc9ae0..1572561 100644 --- a/chrome/browser/user_style_sheet_watcher.h +++ b/chrome/browser/user_style_sheet_watcher.h @@ -9,10 +9,10 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/file_path_watcher/file_path_watcher.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" class UserStyleSheetLoader; diff --git a/chrome/browser/visitedlink/visitedlink_master.cc b/chrome/browser/visitedlink/visitedlink_master.cc index 0c7b923..ad4ad45 100644 --- a/chrome/browser/visitedlink/visitedlink_master.cc +++ b/chrome/browser/visitedlink/visitedlink_master.cc @@ -22,7 +22,7 @@ #include "base/stack_container.h" #include "base/string_util.h" #include "base/threading/thread_restrictions.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 6d269d2..099046ca 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -22,10 +22,8 @@ #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_plugin_util.h" @@ -33,6 +31,8 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/url_constants.h" #include "chrome/common/web_apps.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #if defined(OS_LINUX) #include "base/environment.h" diff --git a/chrome/browser/web_resource/gpu_blacklist_updater.cc b/chrome/browser/web_resource/gpu_blacklist_updater.cc index ca297a1..367d425 100644 --- a/chrome/browser/web_resource/gpu_blacklist_updater.cc +++ b/chrome/browser/web_resource/gpu_blacklist_updater.cc @@ -6,12 +6,12 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" +#include "content/browser/browser_thread.h" namespace { diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index 30a2c74..a2f8f48 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -9,7 +9,6 @@ #include "base/time.h" #include "base/values.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -17,6 +16,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" +#include "content/browser/browser_thread.h" namespace { diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 1026651..c921961 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -13,7 +13,6 @@ #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/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sync_ui_util.h" @@ -22,6 +21,7 @@ #include "chrome/common/net/url_fetcher.h" #include "chrome/common/notification_service.h" #include "chrome/common/web_resource/web_resource_unpacker.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h index a9fc924..d7d8f3b 100644 --- a/chrome/browser/webdata/web_data_service.h +++ b/chrome/browser/webdata/web_data_service.h @@ -13,8 +13,8 @@ #include "base/file_path.h" #include "base/ref_counted.h" #include "base/synchronization/lock.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/search_engines/template_url_id.h" +#include "content/browser/browser_thread.h" #include "webkit/glue/form_field.h" class AutofillChange; diff --git a/chrome/test/live_sync/live_sessions_sync_test.cc b/chrome/test/live_sync/live_sessions_sync_test.cc index f6908f3..90fd9be 100644 --- a/chrome/test/live_sync/live_sessions_sync_test.cc +++ b/chrome/test/live_sync/live_sessions_sync_test.cc @@ -4,14 +4,14 @@ #include "chrome/test/live_sync/live_sessions_sync_test.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/test/ui_test_utils.h" -#include "googleurl/src/gurl.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "googleurl/src/gurl.h" TestSessionService::TestSessionService() : SessionServiceTestHelper(), diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc index a4afa98..76bc542 100644 --- a/chrome/test/live_sync/live_sync_test.cc +++ b/chrome/test/live_sync/live_sync_test.cc @@ -17,7 +17,6 @@ #include "base/threading/platform_thread.h" #include "base/values.h" #include "base/synchronization/waitable_event.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -29,6 +28,7 @@ #include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index 962d69b..2f8f066 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -19,13 +19,13 @@ #include "base/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/top_sites.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/testing_profile.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/notification_service.h" +#include "content/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index 9b9842c..5bb3ef4 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -13,10 +13,10 @@ #include "base/win/scoped_handle.h" #include "chrome/app/scoped_ole_initializer.h" #include "chrome/browser/browser_process_impl.h" -#include "chrome/browser/browser_thread.h" #include "chrome_frame/test/test_server.h" #include "chrome_frame/test/net/test_automation_provider.h" #include "chrome_frame/test/net/process_singleton_subclass.h" +#include "content/browser/browser_thread.h" #include "net/base/net_test_suite.h" class ProcessSingleton; diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index adc681e..e08817e 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -33,7 +33,6 @@ #include "base/test/test_file_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" @@ -55,6 +54,7 @@ #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/ie_event_sink.h" #include "chrome_frame/utils.h" +#include "content/browser/browser_thread.h" #include "net/base/net_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/chrome_blob_storage_context.h b/content/browser/chrome_blob_storage_context.h index 1c5fe55..cbfab1e 100644 --- a/content/browser/chrome_blob_storage_context.h +++ b/content/browser/chrome_blob_storage_context.h @@ -8,7 +8,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" class GURL; diff --git a/content/browser/host_zoom_map.cc b/content/browser/host_zoom_map.cc index 0581036..d469076 100644 --- a/content/browser/host_zoom_map.cc +++ b/content/browser/host_zoom_map.cc @@ -8,7 +8,6 @@ #include "base/string_piece.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_pref_update.h" #include "chrome/browser/profiles/profile.h" @@ -17,6 +16,7 @@ #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.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 "googleurl/src/gurl.h" diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc index 5e8020e..fb35842 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc @@ -6,13 +6,13 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/indexed_db_messages.h" +#include "content/browser/browser_thread.h" #include "content/browser/in_process_webkit/indexed_db_callbacks.h" #include "content/browser/renderer_host/render_message_filter.h" #include "content/browser/renderer_host/render_view_host_notification_task.h" diff --git a/content/browser/renderer_host/buffered_resource_handler.cc b/content/browser/renderer_host/buffered_resource_handler.cc index 2e302f8..3da8c5e 100644 --- a/content/browser/renderer_host/buffered_resource_handler.cc +++ b/content/browser/renderer_host/buffered_resource_handler.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/string_util.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/download_throttling_resource_handler.h" #include "chrome/common/extensions/user_script.h" #include "chrome/common/resource_response.h" #include "chrome/common/url_constants.h" +#include "content/browser/browser_thread.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/x509_user_cert_resource_handler.h" diff --git a/content/browser/renderer_host/pepper_file_message_filter.cc b/content/browser/renderer_host/pepper_file_message_filter.cc index 4d81dc5..fc551df 100644 --- a/content/browser/renderer_host/pepper_file_message_filter.cc +++ b/content/browser/renderer_host/pepper_file_message_filter.cc @@ -8,11 +8,11 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/process_util.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" #include "chrome/common/child_process_host.h" #include "chrome/common/pepper_file_messages.h" +#include "content/browser/browser_thread.h" #include "ipc/ipc_platform_file.h" #include "webkit/plugins/ppapi/file_path.h" diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc index ae582ad..d19029a 100644 --- a/content/browser/renderer_host/pepper_message_filter.cc +++ b/content/browser/renderer_host/pepper_message_filter.cc @@ -7,11 +7,11 @@ #include "base/basictypes.h" #include "base/process_util.h" #include "base/threading/worker_pool.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/browser_render_process_host.h" #include "chrome/common/pepper_messages.h" +#include "content/browser/browser_thread.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/base/host_resolver.h" diff --git a/content/browser/renderer_host/render_message_filter_gtk.cc b/content/browser/renderer_host/render_message_filter_gtk.cc index 1d25313..4a46691 100644 --- a/content/browser/renderer_host/render_message_filter_gtk.cc +++ b/content/browser/renderer_host/render_message_filter_gtk.cc @@ -4,8 +4,8 @@ #include "content/browser/renderer_host/render_message_filter.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/render_messages.h" +#include "content/browser/browser_thread.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" #include "third_party/WebKit/Source/WebKit/chromium/public/x11/WebScreenInfoFactory.h" #include "ui/base/clipboard/clipboard.h" diff --git a/content/browser/renderer_host/render_message_filter_mac.mm b/content/browser/renderer_host/render_message_filter_mac.mm index a7d7c9f..4cbcef9 100644 --- a/content/browser/renderer_host/render_message_filter_mac.mm +++ b/content/browser/renderer_host/render_message_filter_mac.mm @@ -8,8 +8,8 @@ #include "base/message_loop.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/browser_thread.h" #import "chrome/browser/ui/cocoa/find_pasteboard.h" +#include "content/browser/browser_thread.h" // The number of utf16 code units that will be written to the find pasteboard, // longer texts are silently ignored. This is to prevent that a compromised diff --git a/content/browser/renderer_host/render_view_host_notification_task.h b/content/browser/renderer_host/render_view_host_notification_task.h index f9051c4..c8f5753 100644 --- a/content/browser/renderer_host/render_view_host_notification_task.h +++ b/content/browser/renderer_host/render_view_host_notification_task.h @@ -13,7 +13,7 @@ #include "base/callback.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_view_host_delegate.h" diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc index c3bb7de..4c474c7 100644 --- a/content/browser/renderer_host/render_widget_helper.cc +++ b/content/browser/renderer_host/render_widget_helper.cc @@ -6,8 +6,8 @@ #include "base/eintr_wrapper.h" #include "base/threading/thread.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/render_messages_params.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/renderer_host/resource_dispatcher_host.h" diff --git a/content/browser/renderer_host/resource_handler.h b/content/browser/renderer_host/resource_handler.h index c4de36e..838f887 100644 --- a/content/browser/renderer_host/resource_handler.h +++ b/content/browser/renderer_host/resource_handler.h @@ -15,7 +15,7 @@ #include <string> -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" namespace net { class IOBuffer; diff --git a/content/browser/renderer_host/resource_queue.cc b/content/browser/renderer_host/resource_queue.cc index ef58791..98eddd6 100644 --- a/content/browser/renderer_host/resource_queue.cc +++ b/content/browser/renderer_host/resource_queue.cc @@ -5,7 +5,7 @@ #include "content/browser/renderer_host/resource_queue.h" #include "base/stl_util-inl.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "content/browser/renderer_host/global_request_id.h" #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc index d13965e..c97d946 100644 --- a/content/browser/tab_contents/interstitial_page.cc +++ b/content/browser/tab_contents/interstitial_page.cc @@ -13,19 +13,19 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_operation_notification_details.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/render_widget_host_view.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/dom_storage_common.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/notification_source.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/renderer_host/render_widget_host_view.h" +#include "content/browser/renderer_host/resource_dispatcher_host.h" +#include "content/browser/site_instance.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" |