diff options
Diffstat (limited to 'chrome/browser/ui/views')
12 files changed, 17 insertions, 12 deletions
diff --git a/chrome/browser/ui/views/clear_data_view.cc b/chrome/browser/ui/views/clear_data_view.cc index d3fbf4d..534e6ca 100644 --- a/chrome/browser/ui/views/clear_data_view.cc +++ b/chrome/browser/ui/views/clear_data_view.cc @@ -11,7 +11,6 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/clear_browsing_data.h" #include "chrome/browser/ui/views/clear_server_data.h" #include "gfx/insets.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index 7933b39..184cd9f 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -4,7 +4,8 @@ #include "chrome/browser/ui/views/dropdown_bar_host.h" -#include "chrome/browser/ui/browser.h" +#include <algorithm> + #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/dropdown_bar_view.h" #include "chrome/browser/ui/views/frame/browser_view.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index 93de3c5..7cc35db 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -4,6 +4,8 @@ #include "chrome/browser/ui/views/extensions/extension_installed_bubble.h" +#include <algorithm> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/i18n/rtl.h" @@ -11,7 +13,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/browser_actions_container.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index bfd74e3..4adb96f 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -4,10 +4,11 @@ #include "chrome/browser/ui/views/find_bar_host.h" +#include <algorithm> + #include "chrome/browser/renderer_host/render_view_host.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/find_bar/find_bar_controller.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/find_bar_view.h" diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc index 32de496..09b8dd8 100644 --- a/chrome/browser/ui/views/html_dialog_view.cc +++ b/chrome/browser/ui/views/html_dialog_view.cc @@ -4,8 +4,9 @@ #include "chrome/browser/ui/views/html_dialog_view.h" +#include <vector> + #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/window.h" #include "chrome/common/native_web_keyboard_event.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index 32c29cc..87591b1 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -12,6 +12,8 @@ #include <vsstyle.h> #include <vssym32.h> +#include <string> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -38,7 +40,6 @@ #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/options/options_util.h" #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/browser/ui/views/browser_dialogs.h" diff --git a/chrome/browser/ui/views/options/content_page_view.cc b/chrome/browser/ui/views/options/content_page_view.cc index 552ca7a..7bcc773 100644 --- a/chrome/browser/ui/views/options/content_page_view.cc +++ b/chrome/browser/ui/views/options/content_page_view.cc @@ -9,6 +9,8 @@ #include <vsstyle.h> #include <vssym32.h> +#include <string> + #include "app/l10n_util.h" #include "base/command_line.h" #include "base/string_util.h" @@ -20,7 +22,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/sync/sync_setup_wizard.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/importer_view.h" #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" #include "chrome/browser/ui/views/options/options_group_view.h" diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc index e3ad120..2f4c56d 100644 --- a/chrome/browser/ui/views/options/general_page_view.cc +++ b/chrome/browser/ui/views/options/general_page_view.cc @@ -4,6 +4,9 @@ #include "chrome/browser/ui/views/options/general_page_view.h" +#include <string> +#include <vector> + #include "app/combobox_model.h" #include "app/l10n_util.h" #include "base/callback.h" @@ -23,7 +26,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/search_engines/template_url_model_observer.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/browser/ui/views/keyword_editor_view.h" #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" diff --git a/chrome/browser/ui/views/options/plugin_filter_page_view.cc b/chrome/browser/ui/views/options/plugin_filter_page_view.cc index e8e3ddf..a8bc607 100644 --- a/chrome/browser/ui/views/options/plugin_filter_page_view.cc +++ b/chrome/browser/ui/views/options/plugin_filter_page_view.cc @@ -6,7 +6,6 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc index 45bb28f..dd2eae4 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc @@ -15,7 +15,6 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/ssl/ssl_client_auth_handler.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/ui/browser.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc index 52ad4ba..d46c36b 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_view_win.cc @@ -6,6 +6,8 @@ #include <windows.h> +#include <vector> + #include "base/time.h" #include "chrome/browser/download/download_request_limiter.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -16,7 +18,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/web_drop_target_win.h" -#include "chrome/browser/ui/browser.h" // TODO(beng): this dependency is awful. #include "chrome/browser/ui/views/sad_tab_view.h" #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h" #include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 0f3fae4..7d02fbd 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -14,7 +14,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.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/tabs/tab.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" |