diff options
Diffstat (limited to 'chrome')
35 files changed, 21 insertions, 44 deletions
diff --git a/chrome/browser/cert_store.cc b/chrome/browser/cert_store.cc index e2f9c2c..8c2d021 100644 --- a/chrome/browser/cert_store.cc +++ b/chrome/browser/cert_store.cc @@ -10,7 +10,6 @@ #include "base/stl_util-inl.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" template <typename T> diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc index 75d8b40..24fc64a 100644 --- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc +++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc @@ -4,6 +4,8 @@ #include "chrome/browser/chromeos/dom_ui/imageburner_ui.h" +#include <algorithm> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/i18n/rtl.h" @@ -18,6 +20,7 @@ #include "chrome/browser/download/download_types.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.h b/chrome/browser/chromeos/dom_ui/imageburner_ui.h index 5803762..44041e5 100644 --- a/chrome/browser/chromeos/dom_ui/imageburner_ui.h +++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.h @@ -22,7 +22,6 @@ #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_util.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "net/base/file_stream.h" @@ -38,6 +37,7 @@ static const std::string kImageFileName = "chromeos_image.bin.gz"; static const std::string kTempImageFolderName = "chromeos_image"; class ImageBurnResourceManager; +class TabContents; class ImageBurnUIHTMLSource : public ChromeURLDataManager::DataSource { public: @@ -223,4 +223,3 @@ class ImageBurnUI : public DOMUI { DISALLOW_COPY_AND_ASSIGN(ImageBurnUI); }; #endif // CHROME_BROWSER_CHROMEOS_DOM_UI_IMAGEBURNER_UI_H_ - diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc index 1d0b50b..635cf4a 100644 --- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc @@ -26,8 +26,6 @@ #include "chrome/browser/chromeos/login/ownership_service.h" #include "chrome/browser/chromeos/status/network_menu.h" #include "chrome/browser/dom_ui/dom_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/views/window.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index d6dfe78a..f3cad34 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -6,6 +6,7 @@ #include <string> #include <vector> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/x11_util.h" @@ -25,7 +26,6 @@ #include "chrome/browser/chromeos/status/status_area_view.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/dom_view.h" #include "cros/chromeos_wm_ipc_enums.h" #include "googleurl/src/gurl.h" @@ -40,8 +40,8 @@ // X Windows headers have "#define Status int". That interferes with // NetworkLibrary header which defines enum "Status". -#include <X11/cursorfont.h> -#include <X11/Xcursor/Xcursor.h> +#include <X11/cursorfont.h> // NOLINT +#include <X11/Xcursor/Xcursor.h> // NOLINT using views::WidgetGtk; diff --git a/chrome/browser/chromeos/panels/panel_browsertest.cc b/chrome/browser/chromeos/panels/panel_browsertest.cc index f655369..74f2a54 100644 --- a/chrome/browser/chromeos/panels/panel_browsertest.cc +++ b/chrome/browser/chromeos/panels/panel_browsertest.cc @@ -4,11 +4,9 @@ #include "base/command_line.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/in_process_browser_test.h" @@ -27,7 +25,6 @@ class PanelTest : public InProcessBrowserTest { virtual void SetUpCommandLine(CommandLine* command_line) { command_line->AppendSwitch(switches::kDisablePopupBlocking); } - }; // Small popups should open as a panel. diff --git a/chrome/browser/chromeos/update_browsertest.cc b/chrome/browser/chromeos/update_browsertest.cc index 2c0798d..1129e12 100644 --- a/chrome/browser/chromeos/update_browsertest.cc +++ b/chrome/browser/chromeos/update_browsertest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/chromeos/cros/mock_update_library.h" #include "chrome/browser/chromeos/update_observer.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/dom_element_proxy.h" @@ -118,4 +117,3 @@ IN_PROC_BROWSER_TEST_F(UpdateBrowserTest, Notifications) { } } // namespace - diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index feaf61d..92b5393 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -4,7 +4,6 @@ #include "base/file_path.h" #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/notification_type.h" #include "chrome/common/page_transition_types.h" diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc index 38bdc2a..053b49a 100644 --- a/chrome/browser/debugger/devtools_manager.cc +++ b/chrome/browser/debugger/devtools_manager.cc @@ -19,7 +19,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/debugger/devtools_protocol_handler.cc b/chrome/browser/debugger/devtools_protocol_handler.cc index 3d5300e..6e72ef0 100644 --- a/chrome/browser/debugger/devtools_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_protocol_handler.cc @@ -9,7 +9,6 @@ #include "chrome/browser/debugger/inspectable_tab_proxy.h" #include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/devtools_remote_listen_socket.h" -#include "chrome/browser/tab_contents/tab_contents.h" DevToolsProtocolHandler::DevToolsProtocolHandler(int port) : port_(port), diff --git a/chrome/browser/dom_ui/constrained_html_ui.cc b/chrome/browser/dom_ui/constrained_html_ui.cc index 3d90faf..75aeda1 100644 --- a/chrome/browser/dom_ui/constrained_html_ui.cc +++ b/chrome/browser/dom_ui/constrained_html_ui.cc @@ -7,6 +7,7 @@ #include "base/lazy_instance.h" #include "chrome/browser/dom_ui/dom_ui_util.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/common/bindings_policy.h" diff --git a/chrome/browser/dom_ui/constrained_html_ui.h b/chrome/browser/dom_ui/constrained_html_ui.h index 8327c99..48b769f 100644 --- a/chrome/browser/dom_ui/constrained_html_ui.h +++ b/chrome/browser/dom_ui/constrained_html_ui.h @@ -10,7 +10,7 @@ #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/tab_contents/constrained_window.h" -#include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/common/property_bag.h" class HtmlDialogUIDelegate; class Profile; diff --git a/chrome/browser/dom_ui/foreign_session_handler.cc b/chrome/browser/dom_ui/foreign_session_handler.cc index 4583234..f6f88bd 100644 --- a/chrome/browser/dom_ui/foreign_session_handler.cc +++ b/chrome/browser/dom_ui/foreign_session_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/dom_ui/foreign_session_handler.h" +#include <string> + #include "base/scoped_vector.h" #include "base/utf_string_conversions.h" #include "chrome/browser/dom_ui/value_helper.h" @@ -11,7 +13,6 @@ #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc index f0c1229..c075793 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -4,6 +4,8 @@ #include "chrome/browser/dom_ui/new_tab_page_sync_handler.h" +#include <vector> + #include "app/l10n_util.h" #include "base/callback.h" #include "base/string_split.h" @@ -14,7 +16,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index fde56b5..913e5f2 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/net/url_request_mock_http_job.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index 850a344..cc5cb43 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -11,7 +11,6 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/native_web_keyboard_event.h" diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index 8959de1..d973ea5 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -4,6 +4,8 @@ #include "chrome/browser/extensions/extension_popup_api.h" +#include <string> + #include "base/json/json_writer.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -15,7 +17,6 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/window_sizer.h" diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 7fe20b9f..d3d2d85 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -4,7 +4,6 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_apitest.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" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 4490d33..a1b31cd 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -4,6 +4,8 @@ #include "chrome/browser/file_select_helper.h" +#include <string> + #include "app/l10n_util.h" #include "base/file_util.h" #include "base/string_split.h" @@ -15,8 +17,6 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "chrome/common/render_messages_params.h" diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc index 3c47c38..ecce9aa 100644 --- a/chrome/browser/gtk/download_shelf_gtk.cc +++ b/chrome/browser/gtk/download_shelf_gtk.cc @@ -4,6 +4,8 @@ #include "chrome/browser/gtk/download_shelf_gtk.h" +#include <string> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/download/download_item.h" @@ -16,7 +18,6 @@ #include "chrome/browser/gtk/gtk_chrome_shrinkable_hbox.h" #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/notification_service.h" #include "gfx/gtk_util.h" diff --git a/chrome/browser/gtk/external_protocol_dialog_gtk.cc b/chrome/browser/gtk/external_protocol_dialog_gtk.cc index f59a26e..290d859 100644 --- a/chrome/browser/gtk/external_protocol_dialog_gtk.cc +++ b/chrome/browser/gtk/external_protocol_dialog_gtk.cc @@ -15,8 +15,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/gtk/gtk_util.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 "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index d0f7774..b17d25f 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -22,7 +22,6 @@ #include "chrome/browser/renderer_host/backing_store_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 045321f..959cebd 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -14,7 +14,6 @@ #include "chrome/browser/renderer_host/backing_store_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/speech/speech_input_manager.cc b/chrome/browser/speech/speech_input_manager.cc index 181786b..b370da4 100644 --- a/chrome/browser/speech/speech_input_manager.cc +++ b/chrome/browser/speech/speech_input_manager.cc @@ -17,7 +17,6 @@ #include "chrome/browser/speech/speech_input_bubble_controller.h" #include "chrome/browser/speech/speech_recognizer.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc index 10e3108..7922a0e 100644 --- a/chrome/browser/sync/profile_sync_service_harness.cc +++ b/chrome/browser/sync/profile_sync_service_harness.cc @@ -10,7 +10,6 @@ #include "chrome/browser/sync/glue/sync_backend_host.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/sessions/session_state.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/net/gaia/google_service_auth_error.h" @@ -359,7 +358,7 @@ bool ProfileSyncServiceHarness::AwaitSyncCycleCompletion( if (wait_state_ == FULLY_SYNCED) { // Client is online; sync was successful. return true; - } else if (wait_state_ == SERVER_UNREACHABLE){ + } else if (wait_state_ == SERVER_UNREACHABLE) { // Client is offline; sync was unsuccessful. return false; } else { diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 0873c62..9d27d2b 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -14,7 +14,6 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" -#include "chrome/browser/cancelable_request.h" #include "chrome/browser/dom_ui/dom_ui_factory.h" #include "chrome/browser/download/save_package.h" #include "chrome/browser/extensions/image_loading_tracker.h" diff --git a/chrome/browser/ui/browser_init_browsertest.cc b/chrome/browser/ui/browser_init_browsertest.cc index 7cf64f98..4f1e044 100644 --- a/chrome/browser/ui/browser_init_browsertest.cc +++ b/chrome/browser/ui/browser_init_browsertest.cc @@ -7,7 +7,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_init.h" #include "chrome/test/in_process_browser_test.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index 6f5004f..1d2fb2d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm @@ -10,7 +10,6 @@ #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" #include "chrome/browser/ui/cocoa/event_utils.h" diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm index a0b4211..f3662a4 100644 --- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller.mm @@ -10,7 +10,6 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/event_utils.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/ui/cocoa/infobar_controller.mm b/chrome/browser/ui/cocoa/infobar_controller.mm index 1400c66..ae1414c 100644 --- a/chrome/browser/ui/cocoa/infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobar_controller.mm @@ -8,7 +8,6 @@ #include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "chrome/browser/tab_contents/tab_contents.h" #import "chrome/browser/ui/cocoa/animatable_view.h" #include "chrome/browser/ui/cocoa/event_utils.h" #include "chrome/browser/ui/cocoa/infobar.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index 711e0f5..f3367d2 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -7,8 +7,6 @@ #include "app/keyboard_codes.h" #include "app/slide_animation.h" #include "base/scoped_handle.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/view_ids.h" #include "chrome/browser/ui/views/dropdown_bar_view.h" diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc index 1ce95eb..509188f 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc @@ -8,7 +8,6 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/browser_actions_container.h" #include "chrome/browser/views/extensions/browser_action_drag_data.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index ebc59a8..152e6e5 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -14,7 +14,6 @@ #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/search_engines/template_url_model_observer.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/views/extensions/extension_popup.h" @@ -44,6 +43,7 @@ class Profile; class SelectedKeywordView; class StarView; class SuggestedTextView; +class TabContents; class TabContentsWrapper; class TemplateURLModel; diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 547b039..27f82d4 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc @@ -14,7 +14,6 @@ #include "base/file_util.h" #include "base/logging.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "gfx/canvas.h" #include "gfx/favicon_size.h" #include "grit/app_resources.h" diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index b94cd04..14a294c 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -15,7 +15,6 @@ #include "chrome/browser/possible_url_model.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" |