diff options
Diffstat (limited to 'chrome/browser/views')
28 files changed, 31 insertions, 31 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index ddea13a..443a86f 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -6,18 +6,18 @@ #include "app/bidi_line_iterator.h" #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" -#include "base/i18n/word_iterator.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/callback.h" #include "base/file_version_info.h" +#include "base/i18n/word_iterator.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/platform_util.h" #include "chrome/common/url_constants.h" +#include "gfx/color_utils.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/appcache_info_view.cc b/chrome/browser/views/appcache_info_view.cc index 8cc53c2..ade35f8 100644 --- a/chrome/browser/views/appcache_info_view.cc +++ b/chrome/browser/views/appcache_info_view.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index c6eeff0..77c9ae3 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -6,7 +6,6 @@ #include "app/bidi_line_iterator.h" #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -15,6 +14,7 @@ #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/bubble_positioner.h" #include "chrome/browser/views/bubble_border.h" +#include "gfx/color_utils.h" #include "gfx/insets.h" #include "gfx/path.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc index 54ac769..ff88e82 100644 --- a/chrome/browser/views/autofill_profiles_view_win.cc +++ b/chrome/browser/views/autofill_profiles_view_win.cc @@ -7,7 +7,6 @@ #include <vssym32.h> #include "app/gfx/canvas.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" @@ -17,6 +16,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/theme_resources_util.h" #include "chrome/browser/window_sizer.h" +#include "gfx/native_theme_win.h" #include "gfx/size.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index b6d7519..77a6763 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/bookmark_bubble_view.h" #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/keyboard_codes.h" @@ -18,6 +17,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/views/info_bubble.h" #include "chrome/common/notification_service.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/event.h" diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index 289a9cc..d7b0dd8 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -7,8 +7,6 @@ #include <algorithm> #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" -#include "app/gfx/skia_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/keyboard_codes.h" @@ -30,6 +28,8 @@ #include "chrome/browser/views/bookmark_folder_tree_view.h" #include "chrome/browser/views/bookmark_table_view.h" #include "chrome/common/pref_names.h" +#include "gfx/color_utils.h" +#include "gfx/skia_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/cookie_info_view.cc b/chrome/browser/views/cookie_info_view.cc index 8929335..23922b3 100644 --- a/chrome/browser/views/cookie_info_view.cc +++ b/chrome/browser/views/cookie_info_view.cc @@ -7,13 +7,13 @@ #include <algorithm> #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profile.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/border.h" diff --git a/chrome/browser/views/cookie_prompt_view.cc b/chrome/browser/views/cookie_prompt_view.cc index 1c84dd5..46642b3 100644 --- a/chrome/browser/views/cookie_prompt_view.cc +++ b/chrome/browser/views/cookie_prompt_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -22,6 +21,7 @@ #include "chrome/browser/views/local_storage_set_item_info_view.h" #include "chrome/browser/views/options/content_settings_window_view.h" #include "chrome/common/pref_names.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/cookie_monster.h" diff --git a/chrome/browser/views/database_info_view.cc b/chrome/browser/views/database_info_view.cc index 4f5eb54..70596e3 100644 --- a/chrome/browser/views/database_info_view.cc +++ b/chrome/browser/views/database_info_view.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/database_open_info_view.cc b/chrome/browser/views/database_open_info_view.cc index 0a81793..24f4c50 100644 --- a/chrome/browser/views/database_open_info_view.cc +++ b/chrome/browser/views/database_open_info_view.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/detachable_toolbar_view.cc b/chrome/browser/views/detachable_toolbar_view.cc index a3773e6..5b31f3d 100644 --- a/chrome/browser/views/detachable_toolbar_view.cc +++ b/chrome/browser/views/detachable_toolbar_view.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/detachable_toolbar_view.h" #include "app/gfx/canvas.h" -#include "app/gfx/skia_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_theme_provider.h" +#include "gfx/skia_util.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 12877c8..05ec139 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "app/gfx/text_elider.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" @@ -21,6 +20,7 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 6191f5d..7f21bca 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -5,11 +5,11 @@ #include "chrome/browser/views/info_bubble.h" #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "base/keyboard_codes.h" #include "chrome/browser/views/bubble_border.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/notification_service.h" +#include "gfx/color_utils.h" #include "gfx/path.h" #include "third_party/skia/include/core/SkPaint.h" #include "views/fill_layout.h" diff --git a/chrome/browser/views/local_storage_info_view.cc b/chrome/browser/views/local_storage_info_view.cc index e47536c..35c7c49 100644 --- a/chrome/browser/views/local_storage_info_view.cc +++ b/chrome/browser/views/local_storage_info_view.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/local_storage_set_item_info_view.cc b/chrome/browser/views/local_storage_set_item_info_view.cc index 3eb13ef..aa620ef 100644 --- a/chrome/browser/views/local_storage_set_item_info_view.cc +++ b/chrome/browser/views/local_storage_set_item_info_view.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 98823bc..6021532 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -9,7 +9,6 @@ #endif #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" @@ -31,6 +30,7 @@ #include "chrome/browser/views/content_blocked_bubble_contents.h" #include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 756396e..ab09db9 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -14,7 +14,6 @@ #include "app/combobox_model.h" #include "app/gfx/canvas.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" @@ -40,6 +39,7 @@ #include "chrome/browser/views/options/fonts_languages_window_view.h" #include "chrome/browser/views/restart_message_box.h" #include "chrome/common/pref_names.h" +#include "gfx/native_theme_win.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/options/content_filter_page_view.cc b/chrome/browser/views/options/content_filter_page_view.cc index badd057..b74267f 100644 --- a/chrome/browser/views/options/content_filter_page_view.cc +++ b/chrome/browser/views/options/content_filter_page_view.cc @@ -5,13 +5,13 @@ #include "chrome/browser/views/options/content_filter_page_view.h" #include "app/gfx/canvas.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/host_content_settings_map.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/exceptions_view.h" #include "chrome/common/pref_names.h" +#include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 5e70111..7c28557 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -10,7 +10,6 @@ #include <vssym32.h> #include "app/gfx/canvas.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/autofill/autofill_dialog.h" @@ -25,6 +24,7 @@ #include "chrome/browser/views/options/options_group_view.h" #include "chrome/browser/views/options/passwords_exceptions_window_view.h" #include "chrome/common/pref_names.h" +#include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/cookie_filter_page_view.cc b/chrome/browser/views/options/cookie_filter_page_view.cc index 574397e..ac8ac6d 100644 --- a/chrome/browser/views/options/cookie_filter_page_view.cc +++ b/chrome/browser/views/options/cookie_filter_page_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/options/cookie_filter_page_view.h" #include "app/gfx/canvas.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" @@ -16,6 +15,7 @@ #include "chrome/browser/views/options/cookies_view.h" #include "chrome/browser/views/options/exceptions_view.h" #include "chrome/common/pref_names.h" +#include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index cdbb5f3..eddd30c 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/gfx/canvas.h" -#include "app/gfx/color_utils.h" #include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -17,6 +16,7 @@ #include "chrome/browser/views/cookie_info_view.h" #include "chrome/browser/views/database_info_view.h" #include "chrome/browser/views/local_storage_info_view.h" +#include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/cookie_monster.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 34d119f..5b92361 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -14,7 +14,6 @@ #include "app/combobox_model.h" #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/l10n_util_collator.h" #include "app/resource_bundle.h" @@ -26,6 +25,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/common/pref_names.h" +#include "gfx/native_theme_win.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 4c56faa..260baa3 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -11,7 +11,6 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" @@ -27,6 +26,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_common.h" +#include "gfx/native_theme_win.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index f0c2974..bbd24b0 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -9,9 +9,9 @@ #include "app/gfx/canvas.h" #include "app/gfx/font.h" -#include "app/gfx/native_theme_win.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" +#include "gfx/native_theme_win.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 29a8226..4af6681 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -5,11 +5,11 @@ #include "chrome/browser/views/sad_tab_view.h" #include "app/gfx/canvas.h" -#include "app/gfx/skia_util.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "gfx/size.h" +#include "gfx/skia_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index aa65191..1fa805b 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -10,7 +10,6 @@ #endif #include "app/gfx/canvas.h" -#include "app/gfx/favicon_size.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" @@ -18,6 +17,7 @@ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" +#include "gfx/favicon_size.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc index ac41c8a..c08eaaa 100644 --- a/chrome/browser/views/tabs/side_tab.cc +++ b/chrome/browser/views/tabs/side_tab.cc @@ -5,11 +5,11 @@ #include "chrome/browser/views/tabs/side_tab.h" #include "app/gfx/canvas.h" -#include "app/gfx/skia_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "base/utf_string_conversions.h" #include "gfx/path.h" +#include "gfx/skia_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 6b5e1f9..db07e33 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -7,9 +7,7 @@ #include <limits> #include "app/gfx/canvas.h" -#include "app/gfx/favicon_size.h" #include "app/gfx/font.h" -#include "app/gfx/skbitmap_operations.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" @@ -20,6 +18,8 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "gfx/favicon_size.h" +#include "gfx/skbitmap_operations.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" |