diff options
Diffstat (limited to 'chrome')
124 files changed, 164 insertions, 309 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 6be2593..39a47eb 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -7,10 +7,10 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/registry_controlled_domain.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 517787d..e089d9b 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -21,11 +21,11 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/common/notification_service.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index 9af6904..45428ed 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -15,9 +15,9 @@ #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/cocoa/event_utils.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc index fe67b2e..355d192 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc @@ -12,11 +12,11 @@ #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/notification_service.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 2cbd8b9..26fd11d 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -31,9 +31,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/notification_service.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/url_util.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete_history_manager.h b/chrome/browser/autocomplete_history_manager.h index 796e610..8ccd52b 100644 --- a/chrome/browser/autocomplete_history_manager.h +++ b/chrome/browser/autocomplete_history_manager.h @@ -9,8 +9,8 @@ #include <vector> #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/browser/webdata/web_data_service.h" +#include "content/browser/tab_contents/tab_contents_observer.h" namespace webkit_glue { struct FormData; diff --git a/chrome/browser/autofill/autofill_manager.h b/chrome/browser/autofill/autofill_manager.h index 5a2d249..287117c 100644 --- a/chrome/browser/autofill/autofill_manager.h +++ b/chrome/browser/autofill/autofill_manager.h @@ -16,7 +16,7 @@ #include "chrome/browser/autofill/autofill_dialog.h" #include "chrome/browser/autofill/autofill_download.h" #include "chrome/browser/autofill/personal_data_manager.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" +#include "content/browser/tab_contents/tab_contents_observer.h" class AutoFillCCInfoBarDelegate; class AutoFillProfile; diff --git a/chrome/browser/automation/automation_tab_tracker.cc b/chrome/browser/automation/automation_tab_tracker.cc index e672e2e..5d851e6 100644 --- a/chrome/browser/automation/automation_tab_tracker.cc +++ b/chrome/browser/automation/automation_tab_tracker.cc @@ -4,9 +4,9 @@ #include "chrome/browser/automation/automation_tab_tracker.h" -#include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/common/notification_type.h" #include "chrome/common/notification_source.h" +#include "content/browser/tab_contents/navigation_controller.h" AutomationTabTracker::AutomationTabTracker(IPC::Message::Sender* automation) : AutomationResourceTracker<NavigationController*>(automation) { diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 47ca14e..07e00b7 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -57,7 +57,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" @@ -76,6 +75,7 @@ #include "chrome/common/automation_messages.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/interstitial_page.h" #include "net/base/cookie_store.h" #include "net/url_request/url_request_context.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" diff --git a/chrome/browser/blocked_content_container.h b/chrome/browser/blocked_content_container.h index bf13334..a78e092 100644 --- a/chrome/browser/blocked_content_container.h +++ b/chrome/browser/blocked_content_container.h @@ -13,7 +13,7 @@ #include <vector> -#include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" // Takes ownership of TabContents that are unrequested popup windows. class BlockedContentContainer : public TabContentsDelegate { diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc index 85a2559..52145bd 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc @@ -14,9 +14,9 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/page_navigator.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc index 8219e8c..e73f6d9 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/page_navigator.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 80d2bf0..35490c5 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -23,11 +23,11 @@ #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/page_navigator.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/page_navigator.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/app_strings.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index 0a3c01b..1c273fb 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -8,10 +8,10 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/external_protocol_handler.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/views/window.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/login/account_screen.h b/chrome/browser/chromeos/login/account_screen.h index 8d3ca4f..e9179bd 100644 --- a/chrome/browser/chromeos/login/account_screen.h +++ b/chrome/browser/chromeos/login/account_screen.h @@ -14,7 +14,7 @@ #include "chrome/browser/chromeos/login/view_screen.h" #include "chrome/browser/chromeos/login/web_page_screen.h" #include "chrome/browser/chromeos/login/web_page_view.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" class GURL; class WizardScreenDelegate; diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h index 7e9e782..64e5251 100644 --- a/chrome/browser/chromeos/login/eula_view.h +++ b/chrome/browser/chromeos/login/eula_view.h @@ -9,7 +9,7 @@ #include "base/ref_counted.h" #include "chrome/browser/chromeos/login/message_bubble.h" #include "chrome/browser/chromeos/login/view_screen.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "ui/gfx/native_widget_types.h" #include "views/controls/button/button.h" #include "views/controls/link.h" diff --git a/chrome/browser/chromeos/login/web_page_screen.h b/chrome/browser/chromeos/login/web_page_screen.h index 3d4abf0..ec49ad3 100644 --- a/chrome/browser/chromeos/login/web_page_screen.h +++ b/chrome/browser/chromeos/login/web_page_screen.h @@ -8,7 +8,7 @@ #include "base/timer.h" #include "chrome/browser/chromeos/login/screen_observer.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" class GURL; diff --git a/chrome/browser/chromeos/offline/offline_load_page.h b/chrome/browser/chromeos/offline/offline_load_page.h index 53b7909..1223a52 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.h +++ b/chrome/browser/chromeos/offline/offline_load_page.h @@ -10,7 +10,7 @@ #include "base/task.h" #include "chrome/browser/chromeos/network_state_notifier.h" -#include "chrome/browser/tab_contents/interstitial_page.h" +#include "content/browser/tab_contents/interstitial_page.h" class DictionaryValue; class Extension; diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 1c638b7..5f79a53 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -7,13 +7,13 @@ #include "base/command_line.h" #include "chrome/browser/browser_shutdown.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/tabs/tab_strip_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" namespace chromeos { diff --git a/chrome/browser/content_setting_image_model_unittest.cc b/chrome/browser/content_setting_image_model_unittest.cc index 6ffe3fa..9015f2f 100644 --- a/chrome/browser/content_setting_image_model_unittest.cc +++ b/chrome/browser/content_setting_image_model_unittest.cc @@ -5,10 +5,10 @@ #include "chrome/browser/content_setting_image_model.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "net/base/cookie_options.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 190e798..075db38e 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/file_path.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/notification_type.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/debugger/devtools_remote_service.cc b/chrome/browser/debugger/devtools_remote_service.cc index 2c37917..a55c627 100644 --- a/chrome/browser/debugger/devtools_remote_service.cc +++ b/chrome/browser/debugger/devtools_remote_service.cc @@ -14,9 +14,9 @@ #include "chrome/browser/debugger/devtools_protocol_handler.h" #include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/inspectable_tab_proxy.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/devtools_messages.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" const char DevToolsRemoteServiceCommand::kPing[] = "ping"; const char DevToolsRemoteServiceCommand::kVersion[] = "version"; diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index 689ae40..febd7f7 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_toggle_action.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" namespace IPC { class Message; diff --git a/chrome/browser/desktop_notification_handler.h b/chrome/browser/desktop_notification_handler.h index f3c3314..e6b4666 100644 --- a/chrome/browser/desktop_notification_handler.h +++ b/chrome/browser/desktop_notification_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_DESKTOP_NOTIFICATION_HANDLER_H_ #pragma once -#include "chrome/browser/tab_contents/tab_contents_observer.h" +#include "content/browser/tab_contents/tab_contents_observer.h" struct ViewHostMsg_ShowNotification_Params; class RenderProcessHost; diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h index 829f1ae..917da70 100644 --- a/chrome/browser/download/save_package.h +++ b/chrome/browser/download/save_package.h @@ -16,8 +16,8 @@ #include "base/hash_tables.h" #include "base/ref_counted.h" #include "base/task.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/browser/ui/shell_dialogs.h" +#include "content/browser/tab_contents/tab_contents_observer.h" #include "googleurl/src/gurl.h" class SaveFileManager; diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index e0341a5..79e641c 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -11,14 +11,14 @@ #include "chrome/browser/extensions/extension_page_actions_module_constants.h" #include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/navigation_entry.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/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" namespace events = extension_event_names; namespace tab_keys = extension_tabs_module_constants; diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc index 94a1790..2750c18 100644 --- a/chrome/browser/extensions/extension_page_actions_module.cc +++ b/chrome/browser/extensions/extension_page_actions_module.cc @@ -12,13 +12,13 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/render_messages.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" namespace keys = extension_page_actions_module_constants; diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index 4b53699..4b452f6 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -13,11 +13,11 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extension_webnavigation_api_constants.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/provisional_load_details.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages_params.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/provisional_load_details.h" +#include "content/browser/tab_contents/tab_contents.h" #include "net/base/net_errors.h" namespace keys = extension_webnavigation_api_constants; diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 81756d7..80c753f 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -23,7 +23,6 @@ #include "chrome/browser/load_notification_details.h" #include "chrome/browser/page_info_window.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/provisional_load_details.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/browser_dialogs.h" @@ -42,6 +41,7 @@ #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_request_info.h" +#include "content/browser/tab_contents/provisional_load_details.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/external_tab_container_win.h b/chrome/browser/external_tab_container_win.h index 63a5958..b4954c0 100644 --- a/chrome/browser/external_tab_container_win.h +++ b/chrome/browser/external_tab_container_win.h @@ -14,13 +14,13 @@ #include "base/scoped_ptr.h" #include "chrome/browser/automation/automation_resource_message_filter.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/views/frame/browser_bubble_host.h" #include "chrome/browser/ui/views/infobars/infobar_container.h" #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h" #include "chrome/common/navigation_types.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "views/accelerator.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/google/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc index 5c0e05d..142e7c7 100644 --- a/chrome/browser/google/google_url_tracker.cc +++ b/chrome/browser/google/google_url_tracker.cc @@ -14,11 +14,11 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 8943166..74700c8 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -19,10 +19,6 @@ #include "chrome/browser/instant/instant_loader_delegate.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" -#include "content/browser/renderer_host/render_view_host.h" -#include "content/browser/renderer_host/render_widget_host.h" -#include "content/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" @@ -34,6 +30,10 @@ #include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" #include "chrome/common/renderer_preferences.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host.h" +#include "content/browser/renderer_host/render_widget_host_view.h" +#include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" diff --git a/chrome/browser/load_notification_details.h b/chrome/browser/load_notification_details.h index dbb1df7..f869bab 100644 --- a/chrome/browser/load_notification_details.h +++ b/chrome/browser/load_notification_details.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/time.h" -#include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/common/page_transition_types.h" +#include "content/browser/tab_contents/navigation_controller.h" #include "googleurl/src/gurl.h" class LoadNotificationDetails { diff --git a/chrome/browser/page_info_window.h b/chrome/browser/page_info_window.h index 17e28d4..5aaceb3 100644 --- a/chrome/browser/page_info_window.h +++ b/chrome/browser/page_info_window.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PAGE_INFO_WINDOW_H_ #pragma once -#include "chrome/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "ui/gfx/native_widget_types.h" class Profile; diff --git a/chrome/browser/password_manager/password_manager.h b/chrome/browser/password_manager/password_manager.h index 5562d01..c4c1413 100644 --- a/chrome/browser/password_manager/password_manager.h +++ b/chrome/browser/password_manager/password_manager.h @@ -10,8 +10,8 @@ #include "base/stl_util-inl.h" #include "chrome/browser/password_manager/password_form_manager.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/browser/ui/login/login_model.h" +#include "content/browser/tab_contents/tab_contents_observer.h" #include "webkit/glue/password_form.h" #include "webkit/glue/password_form_dom_manager.h" diff --git a/chrome/browser/plugin_observer.h b/chrome/browser/plugin_observer.h index 2d2f895..358ad3b 100644 --- a/chrome/browser/plugin_observer.h +++ b/chrome/browser/plugin_observer.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PLUGIN_OBSERVER_H_ #pragma once -#include "chrome/browser/tab_contents/tab_contents_observer.h" +#include "content/browser/tab_contents/tab_contents_observer.h" class FilePath; class GURL; diff --git a/chrome/browser/prerender/prerender_plt_recorder.h b/chrome/browser/prerender/prerender_plt_recorder.h index 0d52710..3812ae2 100644 --- a/chrome/browser/prerender/prerender_plt_recorder.h +++ b/chrome/browser/prerender/prerender_plt_recorder.h @@ -11,7 +11,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" +#include "content/browser/tab_contents/tab_contents_observer.h" #include "googleurl/src/gurl.h" class PrerenderContents; diff --git a/chrome/browser/printing/print_preview_message_handler.h b/chrome/browser/printing/print_preview_message_handler.h index e1ef29f..eddc489 100644 --- a/chrome/browser/printing/print_preview_message_handler.h +++ b/chrome/browser/printing/print_preview_message_handler.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_PRINTING_PRINT_PREVIEW_MESSAGE_HANDLER_H_ #pragma once -#include "chrome/browser/tab_contents/tab_contents_observer.h" +#include "content/browser/tab_contents/tab_contents_observer.h" struct ViewHostMsg_DidPreviewDocument_Params; diff --git a/chrome/browser/printing/print_view_manager.h b/chrome/browser/printing/print_view_manager.h index 18a4f7e..ffbe9dc 100644 --- a/chrome/browser/printing/print_view_manager.h +++ b/chrome/browser/printing/print_view_manager.h @@ -8,9 +8,9 @@ #include "base/ref_counted.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_observer.h" #include "printing/printed_pages_source.h" class RenderViewHost; diff --git a/chrome/browser/repost_form_warning_controller.h b/chrome/browser/repost_form_warning_controller.h index e6aef10..9811aa7 100644 --- a/chrome/browser/repost_form_warning_controller.h +++ b/chrome/browser/repost_form_warning_controller.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_REPOST_FORM_WARNING_CONTROLLER_H_ #pragma once -#include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/constrained_window.h" class TabContents; diff --git a/chrome/browser/safe_browsing/client_side_detection_host.h b/chrome/browser/safe_browsing/client_side_detection_host.h index 20c8eb7..e98765b 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.h +++ b/chrome/browser/safe_browsing/client_side_detection_host.h @@ -10,7 +10,7 @@ #include "base/ref_counted.h" #include "base/scoped_callback_factory.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" +#include "content/browser/tab_contents/tab_contents_observer.h" #include "googleurl/src/gurl.h" class TabContents; diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 0eeaaf1..26c8e64 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -16,7 +16,6 @@ #include "base/task.h" #include "base/time.h" #include "chrome/browser/safe_browsing/csd.pb.h" -#include "chrome/browser/tab_contents/provisional_load_details.h" #include "chrome/common/net/http_return.h" #include "chrome/common/net/url_fetcher.h" #include "chrome/common/net/url_request_context_getter.h" @@ -25,6 +24,7 @@ #include "chrome/common/render_messages.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/provisional_load_details.h" #include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/safe_browsing/malware_details.h b/chrome/browser/safe_browsing/malware_details.h index bc5f943..efb3eef 100644 --- a/chrome/browser/safe_browsing/malware_details.h +++ b/chrome/browser/safe_browsing/malware_details.h @@ -21,7 +21,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/safe_browsing/report.pb.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" +#include "content/browser/tab_contents/tab_contents_observer.h" class TabContents; struct ViewHostMsg_MalwareDOMDetails_Params; diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h index 2cadfc1..6d80c5b 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h @@ -32,8 +32,8 @@ #include <map> #include <vector> -#include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" +#include "content/browser/tab_contents/interstitial_page.h" #include "googleurl/src/gurl.h" class DictionaryValue; diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc index 795761a..0f679c7 100644 --- a/chrome/browser/sessions/base_session_service.cc +++ b/chrome/browser/sessions/base_session_service.cc @@ -11,7 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_backend.h" #include "chrome/browser/sessions/session_types.h" -#include "chrome/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "webkit/glue/webkit_glue.h" // InternalGetCommandsRequest ------------------------------------------------- diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index f6c9efa..39fc3a4 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -23,14 +23,14 @@ #include "chrome/browser/sessions/session_command.h" #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/sessions/session_types.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser_init.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.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" #if defined(OS_MACOSX) #include "chrome/browser/app_controller_cppsafe_mac.h" diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 17e41ed..0008f37 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_test_helper.h" #include "chrome/browser/sessions/session_types.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" @@ -24,6 +23,7 @@ #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/file_test_utils.h" #include "chrome/test/testing_profile.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "testing/gtest/include/gtest/gtest.h" class SessionServiceTest : public BrowserWithTestWindowTest, diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc index a652e32..f9b1ffd 100644 --- a/chrome/browser/sessions/session_types.cc +++ b/chrome/browser/sessions/session_types.cc @@ -5,9 +5,9 @@ #include "chrome/browser/sessions/session_types.h" #include "base/string_util.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/ui/browser.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" // TabNavigation -------------------------------------------------------------- diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc index 7d32607..7e24c0e 100644 --- a/chrome/browser/sessions/tab_restore_service.cc +++ b/chrome/browser/sessions/tab_restore_service.cc @@ -20,12 +20,12 @@ #include "chrome/browser/sessions/session_command.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.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" using base::Time; diff --git a/chrome/browser/sidebar/sidebar_container.h b/chrome/browser/sidebar/sidebar_container.h index 6b1bbed..9ae2396 100644 --- a/chrome/browser/sidebar/sidebar_container.h +++ b/chrome/browser/sidebar/sidebar_container.h @@ -11,7 +11,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "chrome/browser/extensions/image_loading_tracker.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" class BrowserWindow; class Profile; diff --git a/chrome/browser/speech/speech_input_bubble_mac.mm b/chrome/browser/speech/speech_input_bubble_mac.mm index 912370e..e70df9e 100644 --- a/chrome/browser/speech/speech_input_bubble_mac.mm +++ b/chrome/browser/speech/speech_input_bubble_mac.mm @@ -7,9 +7,9 @@ #include "chrome/browser/speech/speech_input_bubble.h" #import "base/scoped_nsobject.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #import "chrome/browser/ui/cocoa/speech_input_window_controller.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "skia/ext/skia_utils_mac.h" namespace { diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 6abe5d5..3802854 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -7,9 +7,9 @@ #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/views/info_bubble.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/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h index 9b6584d..2e7847c 100644 --- a/chrome/browser/ssl/ssl_blocking_page.h +++ b/chrome/browser/ssl/ssl_blocking_page.h @@ -11,7 +11,7 @@ #include "base/string16.h" #include "chrome/browser/ssl/ssl_error_info.h" -#include "chrome/browser/tab_contents/interstitial_page.h" +#include "content/browser/tab_contents/interstitial_page.h" class DictionaryValue; class SSLCertErrorHandler; diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 1a8dded..d35d90a 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -4,15 +4,15 @@ #include "base/time.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/tab_contents/interstitial_page.h" -#include "chrome/browser/tab_contents/navigation_entry.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_navigator.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/tab_contents/interstitial_page.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "net/base/cert_status_flags.h" #include "net/test/test_server.h" diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 853e402..b752352 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -12,13 +12,13 @@ #include "chrome/browser/ssl/ssl_cert_error_handler.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/ssl/ssl_request_info.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/site_instance.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/cert_status_flags.h" diff --git a/chrome/browser/ssl/ssl_policy_backend.cc b/chrome/browser/ssl/ssl_policy_backend.cc index f193658..a545b85 100644 --- a/chrome/browser/ssl/ssl_policy_backend.cc +++ b/chrome/browser/ssl/ssl_policy_backend.cc @@ -6,7 +6,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_host_state.h" -#include "chrome/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_controller.h" SSLPolicyBackend::SSLPolicyBackend(NavigationController* controller) : ssl_host_state_(controller->profile()->GetSSLHostState()) { diff --git a/chrome/browser/sync/glue/session_change_processor.cc b/chrome/browser/sync/glue/session_change_processor.cc index 56a99fb..7bc7a96 100644 --- a/chrome/browser/sync/glue/session_change_processor.cc +++ b/chrome/browser/sync/glue/session_change_processor.cc @@ -14,11 +14,11 @@ #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/glue/session_model_associator.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/tab_contents.h" namespace browser_sync { diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc index 75c7a0d..20e3dbb 100644 --- a/chrome/browser/sync/glue/session_model_associator.cc +++ b/chrome/browser/sync/glue/session_model_associator.cc @@ -13,13 +13,13 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/syncable/syncable.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" namespace browser_sync { diff --git a/chrome/browser/tab_contents/constrained_window.h b/chrome/browser/tab_contents/constrained_window.h deleted file mode 100644 index b20a60e..0000000 --- a/chrome/browser/tab_contents/constrained_window.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_ -#define CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/constrained_window.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_CONSTRAINED_WINDOW_H_ diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc index 1540dc8..37829cf 100644 --- a/chrome/browser/tab_contents/infobar_delegate.cc +++ b/chrome/browser/tab_contents/infobar_delegate.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "build/build_config.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/navigation_entry.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/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h deleted file mode 100644 index 6a1ddb9..0000000 --- a/chrome/browser/tab_contents/interstitial_page.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ -#define CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/interstitial_page.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_ diff --git a/chrome/browser/tab_contents/language_state.h b/chrome/browser/tab_contents/language_state.h deleted file mode 100644 index 6c35545..0000000 --- a/chrome/browser/tab_contents/language_state.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_LANGUAGE_STATE_H_ -#define CHROME_BROWSER_TAB_CONTENTS_LANGUAGE_STATE_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/language_state.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_LANGUAGE_STATE_H_ - diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h deleted file mode 100644 index 7eb9d11..0000000 --- a/chrome/browser/tab_contents/navigation_controller.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_ -#define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/navigation_controller.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_ diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h deleted file mode 100644 index a9f0cc0..0000000 --- a/chrome/browser/tab_contents/navigation_entry.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_ -#define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/navigation_entry.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_ diff --git a/chrome/browser/tab_contents/page_navigator.h b/chrome/browser/tab_contents/page_navigator.h deleted file mode 100644 index 62c0333..0000000 --- a/chrome/browser/tab_contents/page_navigator.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_ -#define CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/page_navigator.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_PAGE_NAVIGATOR_H_ diff --git a/chrome/browser/tab_contents/provisional_load_details.h b/chrome/browser/tab_contents/provisional_load_details.h deleted file mode 100644 index 1ee04248..0000000 --- a/chrome/browser/tab_contents/provisional_load_details.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_ -#define CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/provisional_load_details.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_PROVISIONAL_LOAD_DETAILS_H_ diff --git a/chrome/browser/tab_contents/render_view_host_manager.h b/chrome/browser/tab_contents/render_view_host_manager.h deleted file mode 100644 index 7f1be04..0000000 --- a/chrome/browser/tab_contents/render_view_host_manager.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ -#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/render_view_host_manager.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_ diff --git a/chrome/browser/tab_contents/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h deleted file mode 100644 index 23d5803..0000000 --- a/chrome/browser/tab_contents/tab_contents_delegate.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_ -#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/tab_contents_delegate.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_DELEGATE_H_ diff --git a/chrome/browser/tab_contents/tab_contents_observer.h b/chrome/browser/tab_contents/tab_contents_observer.h deleted file mode 100644 index 0af56b32..0000000 --- a/chrome/browser/tab_contents/tab_contents_observer.h +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_ -#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_ - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/tab_contents_observer.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_ diff --git a/chrome/browser/tab_contents/tab_contents_view.h b/chrome/browser/tab_contents/tab_contents_view.h deleted file mode 100644 index a703cf2..0000000 --- a/chrome/browser/tab_contents/tab_contents_view.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ -#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/tab_contents_view.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_ diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc index 8374907..e7ea0b1 100644 --- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc +++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc @@ -16,7 +16,6 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" #include "chrome/browser/tab_contents/render_view_context_menu_gtk.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/web_drag_dest_gtk.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/constrained_window_gtk.h" @@ -32,6 +31,7 @@ #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/tab_contents/interstitial_page.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.h b/chrome/browser/tab_contents/tab_contents_view_gtk.h index a11a307..e2d62a2 100644 --- a/chrome/browser/tab_contents/tab_contents_view_gtk.h +++ b/chrome/browser/tab_contents/tab_contents_view_gtk.h @@ -11,11 +11,11 @@ #include <vector> #include "base/scoped_ptr.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/gtk/focus_store_gtk.h" #include "chrome/browser/ui/gtk/owned_widget_gtk.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "ui/base/gtk/gtk_signal.h" class ConstrainedWindowGtk; diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.h b/chrome/browser/tab_contents/tab_contents_view_mac.h index 76d7888..e941cfc 100644 --- a/chrome/browser/tab_contents/tab_contents_view_mac.h +++ b/chrome/browser/tab_contents/tab_contents_view_mac.h @@ -12,10 +12,10 @@ #include <vector> #include "base/scoped_nsobject.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/cocoa/base_view.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "ui/gfx/size.h" @class FocusTracker; diff --git a/chrome/browser/tab_contents/test_tab_contents.h b/chrome/browser/tab_contents/test_tab_contents.h deleted file mode 100644 index 583bd81..0000000 --- a/chrome/browser/tab_contents/test_tab_contents.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_ -#define CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_ -#pragma once - -// TODO(jam): remove this file when all files have been converted. -#include "content/browser/tab_contents/test_tab_contents.h" - -#endif // CHROME_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_ diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index aa87ffbf..5c15069 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -15,7 +15,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/language_state.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/translate/page_translated_details.h" @@ -33,6 +32,7 @@ #include "chrome/common/url_constants.h" #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/language_state.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" diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 1430cce..5bb8a98 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -27,8 +27,6 @@ #include "chrome/browser/tabs/tab_handler.h" #include "chrome/browser/tabs/tab_strip_model_delegate.h" // TODO(beng): remove #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove -#include "chrome/browser/tab_contents/page_navigator.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" #include "chrome/browser/ui/shell_dialogs.h" @@ -38,6 +36,8 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/page_zoom.h" +#include "content/browser/tab_contents/page_navigator.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "ui/gfx/rect.h" class BrowserWindow; diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index a65c1f4..bef8537 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -6,8 +6,6 @@ #include "base/command_line.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/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" @@ -15,7 +13,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/ui_test_utils.h" -#include "ipc/ipc_message.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h"\ GURL BrowserNavigatorTest::GetGoogleURL() const { return GURL("http://www.google.com/"); diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h index cc1b4d8..7f754aa 100644 --- a/chrome/browser/ui/browser_window.h +++ b/chrome/browser/ui/browser_window.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_BROWSER_WINDOW_H_ #pragma once -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/content_settings_types.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "ui/gfx/native_widget_types.h" class Browser; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 2d28c20..0242883 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -14,8 +14,6 @@ #include "chrome/browser/metrics/user_metrics.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/tab_contents/tab_contents_view.h" #import "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -43,6 +41,8 @@ #import "chrome/browser/ui/cocoa/view_resizer.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller.mm b/chrome/browser/ui/cocoa/bug_report_window_controller.mm index b323379..abe5a53 100644 --- a/chrome/browser/ui/cocoa/bug_report_window_controller.mm +++ b/chrome/browser/ui/cocoa/bug_report_window_controller.mm @@ -7,9 +7,9 @@ #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bug_report_util.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/window_snapshot/window_snapshot.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.h b/chrome/browser/ui/cocoa/constrained_window_mac.h index 0ebf88b..629262b 100644 --- a/chrome/browser/ui/cocoa/constrained_window_mac.h +++ b/chrome/browser/ui/cocoa/constrained_window_mac.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "chrome/browser/tab_contents/constrained_window.h" +#include "content/browser/tab_contents/constrained_window.h" #include "base/basictypes.h" #include "base/logging.h" diff --git a/chrome/browser/ui/cocoa/constrained_window_mac.mm b/chrome/browser/ui/cocoa/constrained_window_mac.mm index c8b9965..b46e4ed 100644 --- a/chrome/browser/ui/cocoa/constrained_window_mac.mm +++ b/chrome/browser/ui/cocoa/constrained_window_mac.mm @@ -5,8 +5,8 @@ #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" +#include "content/browser/tab_contents/tab_contents_view.h" #import "third_party/GTM/AppKit/GTMWindowSheetController.h" ConstrainedWindowMacDelegateSystemSheet:: diff --git a/chrome/browser/ui/cocoa/keystone_infobar.mm b/chrome/browser/ui/cocoa/keystone_infobar.mm index e71a401..5735ceb 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar.mm @@ -16,12 +16,12 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 55314d9..bc580bc 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -25,8 +25,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h" #include "chrome/browser/ui/cocoa/event_utils.h" #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" @@ -46,6 +44,8 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/notification_service.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "net/base/net_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 4311bda6..f16cb73 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -22,10 +22,6 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/sidebar/sidebar_container.h" #include "chrome/browser/sidebar/sidebar_manager.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" @@ -42,6 +38,10 @@ #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc index 4c55985..5e413f0 100644 --- a/chrome/browser/ui/find_bar/find_backend_unittest.cc +++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc @@ -5,13 +5,13 @@ #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_profile.h" +#include "content/browser/tab_contents/test_tab_contents.h" typedef TabContentsWrapperTestHarness FindBackendTest; diff --git a/chrome/browser/ui/find_bar/find_bar_controller.cc b/chrome/browser/ui/find_bar/find_bar_controller.cc index 8b99824..49df049 100644 --- a/chrome/browser/ui/find_bar/find_bar_controller.cc +++ b/chrome/browser/ui/find_bar/find_bar_controller.cc @@ -8,13 +8,13 @@ #include "base/i18n/rtl.h" #include "build/build_config.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "ui/gfx/rect.h" // The minimum space between the FindInPage window and the search result. diff --git a/chrome/browser/ui/find_bar/find_tab_helper.h b/chrome/browser/ui/find_bar/find_tab_helper.h index 377224d..555d972 100644 --- a/chrome/browser/ui/find_bar/find_tab_helper.h +++ b/chrome/browser/ui/find_bar/find_tab_helper.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_FIND_BAR_FIND_TAB_HELPER_H_ #pragma once -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" +#include "content/browser/tab_contents/tab_contents_observer.h" // Per-tab find manager. Handles dealing with the life cycle of find sessions. class FindTabHelper : public TabContentsObserver { diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index 9b6d7dd..44d2438 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -19,8 +19,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sync_ui_util.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/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h" @@ -41,6 +39,8 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc index a617334..19c9692 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc @@ -11,12 +11,12 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" #include "chrome/browser/ui/gtk/gtk_chrome_button.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/menu_gtk.h" +#include "content/browser/tab_contents/page_navigator.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 9621a6c..825b78e 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -29,8 +29,6 @@ #include "chrome/browser/page_info_window.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/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" @@ -79,6 +77,8 @@ #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h index 23ec224..90cd2ea 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.h +++ b/chrome/browser/ui/gtk/constrained_window_gtk.h @@ -10,8 +10,8 @@ #include "base/basictypes.h" #include "base/task.h" -#include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/ui/gtk/owned_widget_gtk.h" +#include "content/browser/tab_contents/constrained_window.h" #include "ui/base/gtk/gtk_signal.h" class TabContents; diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h index c1799e0..182009c 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h +++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h @@ -12,10 +12,10 @@ #include "base/scoped_ptr.h" #include "base/timer.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/tabs/dock_info.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "ui/base/x/x11_util.h" class DraggedTabGtk; diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index ad053dc..08db59d 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -10,7 +10,6 @@ #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_manager.h" -#include "chrome/browser/tab_contents/constrained_window.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" @@ -20,6 +19,7 @@ #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/constrained_window.h" #include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/base/auth.h" diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.h b/chrome/browser/ui/search_engines/search_engine_tab_helper.h index e259820..90b088a 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper.h +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_SEARCH_ENGINES_SEARCH_ENGINE_TAB_HELPER_H_ #pragma once -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" +#include "content/browser/tab_contents/tab_contents_observer.h" class SearchEngineTabHelperDelegate; class TabContentsWrapper; diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h index 32211d2..f7eaeb1 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/compiler_specific.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_observer.h" class Extension; class FindTabHelper; diff --git a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc index 10b8a6b..28aa5a4 100644 --- a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/test/testing_profile.h" +#include "content/browser/tab_contents/test_tab_contents.h" TabContentsWrapperTestHarness::TabContentsWrapperTestHarness() : RenderViewHostTestHarness() { diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 593478e..b64c721 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -8,14 +8,14 @@ #include "base/string_number_conversions.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/registry_controlled_domain.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index d692588..49ea7e2 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -10,13 +10,13 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/test/interactive_ui/view_event_test_base.h" #include "chrome/test/testing_profile.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/tab_contents/page_navigator.h" #include "grit/generated_resources.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc index 0bc3d50..1a5eadb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc @@ -14,9 +14,9 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/page_navigator.h" #include "grit/generated_resources.h" BookmarkContextMenuControllerViews::BookmarkContextMenuControllerViews( diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index 7090eec..03a1aec 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -11,10 +11,10 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/browser/ui/views/event_utils.h" #include "chrome/common/page_transition_types.h" +#include "content/browser/tab_contents/page_navigator.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.h b/chrome/browser/ui/views/collected_cookies_win.h index cff1b1d..42f2d0d 100644 --- a/chrome/browser/ui/views/collected_cookies_win.h +++ b/chrome/browser/ui/views/collected_cookies_win.h @@ -8,10 +8,10 @@ #define CHROME_BROWSER_UI_VIEWS_COLLECTED_COOKIES_WIN_H_ #pragma once -#include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/common/content_settings.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/constrained_window.h" #include "views/controls/tree/tree_view.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc index 5b46d34..2f3f932 100644 --- a/chrome/browser/ui/views/constrained_window_win.cc +++ b/chrome/browser/ui/views/constrained_window_win.cc @@ -8,13 +8,13 @@ #include "chrome/app/chrome_command_ids.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/toolbar/toolbar_model.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/notification_service.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/constrained_window_win.h b/chrome/browser/ui/views/constrained_window_win.h index ca20a09..f6b6733 100644 --- a/chrome/browser/ui/views/constrained_window_win.h +++ b/chrome/browser/ui/views/constrained_window_win.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_WIN_H_ #pragma once -#include "chrome/browser/tab_contents/constrained_window.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/constrained_window.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "ui/gfx/rect.h" #include "views/window/window_win.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index e08bc3d..982f74d 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -9,12 +9,12 @@ #include "base/win/windows_version.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/tab_contents/tab_contents_delegate.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/pref_names.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/ui/views/default_search_view.h b/chrome/browser/ui/views/default_search_view.h index 1b07bda..1362a42 100644 --- a/chrome/browser/ui/views/default_search_view.h +++ b/chrome/browser/ui/views/default_search_view.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/string16.h" -#include "chrome/browser/tab_contents/constrained_window.h" +#include "content/browser/tab_contents/constrained_window.h" #include "views/window/dialog_delegate.h" #if defined(TOOLKIT_USES_GTK) diff --git a/chrome/browser/ui/views/download_shelf_view.cc b/chrome/browser/ui/views/download_shelf_view.cc index 5f05b06..04c713d 100644 --- a/chrome/browser/ui/views/download_shelf_view.cc +++ b/chrome/browser/ui/views/download_shelf_view.cc @@ -11,12 +11,12 @@ #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/download_item_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "content/browser/tab_contents/navigation_entry.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/find_bar_host_gtk.cc b/chrome/browser/ui/views/find_bar_host_gtk.cc index bacb9d8..9a086ae 100644 --- a/chrome/browser/ui/views/find_bar_host_gtk.cc +++ b/chrome/browser/ui/views/find_bar_host_gtk.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/find_bar_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/frame/browser_view.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "views/widget/widget_gtk.h" void FindBarHost::AudibleAlert() { diff --git a/chrome/browser/ui/views/location_bar/click_handler.cc b/chrome/browser/ui/views/location_bar/click_handler.cc index 63082cb..311e320 100644 --- a/chrome/browser/ui/views/location_bar/click_handler.cc +++ b/chrome/browser/ui/views/location_bar/click_handler.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/location_bar/click_handler.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/tab_contents.h" #include "views/view.h" ClickHandler::ClickHandler(const views::View* owner, diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc index 36ec052..fc2e3d4 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.cc +++ b/chrome/browser/ui/views/repost_form_warning_view.cc @@ -8,8 +8,8 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.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 "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" #include "ui/base/message_box_flags.h" diff --git a/chrome/browser/ui/views/repost_form_warning_view.h b/chrome/browser/ui/views/repost_form_warning_view.h index 97148be4..9756698 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.h +++ b/chrome/browser/ui/views/repost_form_warning_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_REPOST_FORM_WARNING_VIEW_H_ #pragma once -#include "chrome/browser/tab_contents/constrained_window.h" +#include "content/browser/tab_contents/constrained_window.h" #include "ui/gfx/native_widget_types.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index aae9163..85cf0b8 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -7,8 +7,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/url_constants.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h index 4703505..669ba81 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h @@ -9,7 +9,7 @@ #include <vector> #include "base/scoped_ptr.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "ui/gfx/size.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h index 9be90ef..687bcad 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_views.h @@ -9,7 +9,7 @@ #include <vector> #include "base/scoped_ptr.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "ui/gfx/size.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_win.h b/chrome/browser/ui/views/tab_contents/tab_contents_view_win.h index fad7edc..2525f3a 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_win.h +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_win.h @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/timer.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "ui/gfx/size.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.h b/chrome/browser/ui/views/tabs/dragged_tab_controller.h index 832693c..50bb27c 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.h +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.h @@ -9,11 +9,11 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/timer.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tabs/dock_info.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" #include "ui/gfx/rect.h" namespace views { diff --git a/chrome/browser/ui/webui/constrained_html_ui.h b/chrome/browser/ui/webui/constrained_html_ui.h index 55da2db..723bdd6 100644 --- a/chrome/browser/ui/webui/constrained_html_ui.h +++ b/chrome/browser/ui/webui/constrained_html_ui.h @@ -8,8 +8,8 @@ #include <vector> -#include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/common/property_bag.h" +#include "content/browser/tab_contents/constrained_window.h" #include "content/browser/webui/web_ui.h" class HtmlDialogUIDelegate; diff --git a/chrome/browser/ui/webui/file_browse_browsertest.cc b/chrome/browser/ui/webui/file_browse_browsertest.cc index 030b221..dc934f6 100644 --- a/chrome/browser/ui/webui/file_browse_browsertest.cc +++ b/chrome/browser/ui/webui/file_browse_browsertest.cc @@ -4,14 +4,14 @@ #include "base/path_service.h" #include "base/task.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/tab_contents.h" #include "content/browser/webui/web_ui.h" #include "net/test/test_server.h" diff --git a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h index 3dde68d..418a8f8 100644 --- a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h +++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_HTML_DIALOG_TAB_CONTENTS_DELEGATE_H_ #pragma once -#include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" class Browser; class Profile; diff --git a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc index 371c133..f9c2516 100644 --- a/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc +++ b/chrome/browser/ui/webui/html_dialog_tab_contents_delegate_unittest.cc @@ -9,13 +9,13 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/url_constants.h" #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/test_browser_window.h" #include "chrome/test/testing_profile.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc index cc593f7..5a8864f 100644 --- a/chrome/browser/ui/webui/options/advanced_options_handler.cc +++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc @@ -23,8 +23,6 @@ #include "chrome/browser/remoting/setup_flow.h" #include "chrome/browser/service/service_process_control.h" #include "chrome/browser/service/service_process_control_manager.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/webui/options/dom_options_util.h" @@ -34,6 +32,8 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc index 50c9115..cc34c0a 100644 --- a/chrome/browser/ui/webui/options/advanced_options_utils_win.cc +++ b/chrome/browser/ui/webui/options/advanced_options_utils_win.cc @@ -13,8 +13,8 @@ #include "base/path_service.h" #include "base/threading/thread.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" // A helper method that opens the Internet Options control panel dialog with // the Connections tab selected. diff --git a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc index 379a704..2e51c7c 100644 --- a/chrome/browser/ui/webui/sync_internals_ui_unittest.cc +++ b/chrome/browser/ui/webui/sync_internals_ui_unittest.cc @@ -12,11 +12,11 @@ #include "chrome/browser/sync/js_arg_list.h" #include "chrome/browser/sync/js_test_util.h" #include "chrome/browser/sync/profile_sync_service_mock.h" -#include "chrome/browser/tab_contents/test_tab_contents.h" #include "chrome/common/render_messages_params.h" #include "chrome/test/profile_mock.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/test_render_view_host.h" +#include "content/browser/tab_contents/test_tab_contents.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc index f534b75..c99e84ec 100644 --- a/chrome/test/browser_with_test_window_test.cc +++ b/chrome/test/browser_with_test_window_test.cc @@ -8,9 +8,6 @@ #include <ole2.h> #endif // defined(OS_WIN) -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" @@ -18,6 +15,9 @@ #include "chrome/common/page_transition_types.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" BrowserWithTestWindowTest::BrowserWithTestWindowTest() : ui_thread_(BrowserThread::UI, message_loop()), |