diff options
24 files changed, 27 insertions, 28 deletions
diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h index 4d75eae..dcb78ca 100644 --- a/ui/views/controls/button/text_button.h +++ b/ui/views/controls/button/text_button.h @@ -10,9 +10,9 @@ #include "base/compiler_specific.h" #include "base/string16.h" -#include "ui/gfx/image/image_skia.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font.h" +#include "ui/gfx/image/image_skia.h" #include "ui/views/border.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/native_theme_delegate.h" diff --git a/ui/views/controls/combobox/native_combobox_win.cc b/ui/views/controls/combobox/native_combobox_win.cc index 8a472dd..21c11c2 100644 --- a/ui/views/controls/combobox/native_combobox_win.cc +++ b/ui/views/controls/combobox/native_combobox_win.cc @@ -7,10 +7,10 @@ #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "ui/base/models/combobox_model.h" +#include "ui/base/native_theme/native_theme_win.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "ui/gfx/font.h" -#include "ui/base/native_theme/native_theme_win.h" #include "ui/views/controls/combobox/combobox.h" #include "ui/views/controls/combobox/native_combobox_views.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/controls/focusable_border.cc b/ui/views/controls/focusable_border.cc index de35299..c603df9 100644 --- a/ui/views/controls/focusable_border.cc +++ b/ui/views/controls/focusable_border.cc @@ -4,9 +4,9 @@ #include "ui/views/controls/focusable_border.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/gfx/skia_util.h" namespace { diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc index 21bf14d7..f907f9f 100644 --- a/ui/views/controls/label.cc +++ b/ui/views/controls/label.cc @@ -15,13 +15,13 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/font.h" #include "ui/gfx/insets.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/views/background.h" namespace views { diff --git a/ui/views/controls/menu/menu_config_views.cc b/ui/views/controls/menu/menu_config_views.cc index c690ebd..71bc928 100644 --- a/ui/views/controls/menu/menu_config_views.cc +++ b/ui/views/controls/menu/menu_config_views.cc @@ -5,11 +5,11 @@ #include "ui/views/controls/menu/menu_config.h" #include "grit/ui_resources.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/layout.h" +#include "ui/base/native_theme/native_theme_aura.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" -#include "ui/base/native_theme/native_theme_aura.h" namespace views { diff --git a/ui/views/controls/menu/menu_item_view_views.cc b/ui/views/controls/menu/menu_item_view_views.cc index e859546..1ed2bd8 100644 --- a/ui/views/controls/menu/menu_item_view_views.cc +++ b/ui/views/controls/menu/menu_item_view_views.cc @@ -7,11 +7,11 @@ #include "base/utf_string_conversions.h" #include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/image/image.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/views/controls/menu/menu_config.h" #include "ui/views/controls/menu/menu_image_util.h" #include "ui/views/controls/menu/submenu_view.h" diff --git a/ui/views/controls/menu/menu_item_view_win.cc b/ui/views/controls/menu/menu_item_view_win.cc index ba6f9d7..bca528a 100644 --- a/ui/views/controls/menu/menu_item_view_win.cc +++ b/ui/views/controls/menu/menu_item_view_win.cc @@ -8,8 +8,8 @@ #include <Vssym32.h> #include "grit/ui_strings.h" -#include "ui/gfx/canvas.h" #include "ui/base/native_theme/native_theme_win.h" +#include "ui/gfx/canvas.h" #include "ui/views/controls/menu/menu_config.h" #include "ui/views/controls/menu/submenu_view.h" diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc index 4442328..5d91d6d 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.cc +++ b/ui/views/controls/menu/menu_scroll_view_container.cc @@ -11,9 +11,9 @@ #endif #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/views/border.h" #include "ui/views/controls/menu/menu_config.h" #include "ui/views/controls/menu/menu_controller.h" diff --git a/ui/views/controls/menu/menu_separator_views.cc b/ui/views/controls/menu/menu_separator_views.cc index 1ef788d..61ec07d 100644 --- a/ui/views/controls/menu/menu_separator_views.cc +++ b/ui/views/controls/menu/menu_separator_views.cc @@ -5,8 +5,8 @@ #include "ui/views/controls/menu/menu_separator.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/gfx/canvas.h" #include "ui/base/native_theme/native_theme.h" +#include "ui/gfx/canvas.h" #include "ui/views/controls/menu/menu_config.h" namespace { diff --git a/ui/views/controls/menu/menu_separator_win.cc b/ui/views/controls/menu/menu_separator_win.cc index 6979a50..edd06d5 100644 --- a/ui/views/controls/menu/menu_separator_win.cc +++ b/ui/views/controls/menu/menu_separator_win.cc @@ -8,8 +8,8 @@ #include <uxtheme.h> #include <Vssym32.h> -#include "ui/gfx/canvas.h" #include "ui/base/native_theme/native_theme.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" #include "ui/views/controls/menu/menu_config.h" #include "ui/views/controls/menu/menu_item_view.h" diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc index 94461f33..c11406e 100644 --- a/ui/views/controls/menu/native_menu_win.cc +++ b/ui/views/controls/menu/native_menu_win.cc @@ -12,16 +12,16 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/win/wrapped_window_proc.h" -#include "ui/gfx/image/image_skia.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/models/menu_model.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/base/win/hwnd_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" -#include "ui/base/native_theme/native_theme.h" +#include "ui/gfx/image/image_skia.h" #include "ui/gfx/rect.h" #include "ui/views/controls/menu/menu_2.h" #include "ui/views/controls/menu/menu_config.h" diff --git a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc index ae762f3..8b66e91 100644 --- a/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc +++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_win.cc @@ -9,11 +9,11 @@ #include "base/logging.h" #include "base/stl_util.h" #include "ui/base/l10n/l10n_util_win.h" +#include "ui/base/native_theme/native_theme_win.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" -#include "ui/base/native_theme/native_theme_win.h" #include "ui/views/controls/tabbed_pane/tabbed_pane.h" #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h" #include "ui/views/layout/fill_layout.h" diff --git a/ui/views/controls/table/table_view_win.cc b/ui/views/controls/table/table_view_win.cc index 42a266a..5ed8725 100644 --- a/ui/views/controls/table/table_view_win.cc +++ b/ui/views/controls/table/table_view_win.cc @@ -13,7 +13,6 @@ #include "base/string_util.h" #include "base/win/scoped_gdi_object.h" #include "skia/ext/skia_utils_win.h" -#include "ui/gfx/image/image_skia.h" #include "third_party/skia/include/core/SkColorFilter.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc index 3744d977..32b53d7 100644 --- a/ui/views/controls/textfield/native_textfield_win.cc +++ b/ui/views/controls/textfield/native_textfield_win.cc @@ -20,9 +20,9 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" +#include "ui/base/native_theme/native_theme_win.h" #include "ui/base/range/range.h" #include "ui/base/win/mouse_wheel_util.h" -#include "ui/base/native_theme/native_theme_win.h" #include "ui/views/controls/label.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" diff --git a/ui/views/controls/textfield/textfield_views_model.cc b/ui/views/controls/textfield/textfield_views_model.cc index b26c7f0b..3053caa 100644 --- a/ui/views/controls/textfield/textfield_views_model.cc +++ b/ui/views/controls/textfield/textfield_views_model.cc @@ -12,11 +12,11 @@ #include "base/utf_string_conversions.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/clipboard/scoped_clipboard_writer.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/base/range/range.h" #include "ui/base/text/utf16_indexing.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/gfx/render_text.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/views_delegate.h" diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc index d9feb14..18dc58e 100644 --- a/ui/views/controls/throbber.cc +++ b/ui/views/controls/throbber.cc @@ -6,10 +6,10 @@ #include "base/time.h" #include "grit/ui_resources.h" -#include "ui/gfx/image/image_skia.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/image/image_skia.h" using base::Time; using base::TimeDelta; diff --git a/ui/views/controls/tree/tree_view_views.cc b/ui/views/controls/tree/tree_view_views.cc index 20634e9..3e84dd9 100644 --- a/ui/views/controls/tree/tree_view_views.cc +++ b/ui/views/controls/tree/tree_view_views.cc @@ -11,10 +11,10 @@ #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/gfx/skia_util.h" #include "ui/views/background.h" #include "ui/views/border.h" diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc index 4754803..dcc85e8 100644 --- a/ui/views/controls/webview/webview.cc +++ b/ui/views/controls/webview/webview.cc @@ -13,8 +13,8 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "ipc/ipc_message.h" -#include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/accessibility/accessibility_types.h" +#include "ui/base/accessibility/accessible_view_state.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/views_delegate.h" diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h index cf6cb86..a262180 100644 --- a/ui/views/focus/focus_manager.h +++ b/ui/views/focus/focus_manager.h @@ -12,8 +12,8 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "ui/base/accelerators/accelerator_manager.h" #include "ui/base/accelerators/accelerator.h" +#include "ui/base/accelerators/accelerator_manager.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/events/event.h" #include "ui/views/views_export.h" diff --git a/ui/views/view_model_utils.cc b/ui/views/view_model_utils.cc index 1d33b14..056e75b 100644 --- a/ui/views/view_model_utils.cc +++ b/ui/views/view_model_utils.cc @@ -6,8 +6,8 @@ #include <algorithm> -#include "ui/views/view_model.h" #include "ui/views/view.h" +#include "ui/views/view_model.h" namespace views { diff --git a/ui/views/widget/desktop_native_widget_helper_aura.cc b/ui/views/widget/desktop_native_widget_helper_aura.cc index f0eee46..ef90cd7 100644 --- a/ui/views/widget/desktop_native_widget_helper_aura.cc +++ b/ui/views/widget/desktop_native_widget_helper_aura.cc @@ -4,11 +4,11 @@ #include "ui/views/widget/desktop_native_widget_helper_aura.h" -#include "ui/aura/root_window.h" -#include "ui/aura/desktop/desktop_activation_client.h" -#include "ui/aura/desktop/desktop_dispatcher_client.h" #include "ui/aura/client/dispatcher_client.h" #include "ui/aura/client/screen_position_client.h" +#include "ui/aura/desktop/desktop_activation_client.h" +#include "ui/aura/desktop/desktop_dispatcher_client.h" +#include "ui/aura/root_window.h" #include "ui/aura/shared/input_method_event_filter.h" #include "ui/aura/shared/root_window_event_filter.h" #include "ui/views/widget/native_widget_aura.h" diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index da0e0eb..4ae16e2 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -21,6 +21,7 @@ #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/l10n/l10n_util_win.h" +#include "ui/base/native_theme/native_theme_win.h" #include "ui/base/theme_provider.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" @@ -29,7 +30,6 @@ #include "ui/gfx/canvas_paint.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/icon_util.h" -#include "ui/base/native_theme/native_theme_win.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" #include "ui/views/accessibility/native_view_accessibility_win.h" diff --git a/ui/views/widget/widget_message_filter.cc b/ui/views/widget/widget_message_filter.cc index f2239e6..f86ab2b 100644 --- a/ui/views/widget/widget_message_filter.cc +++ b/ui/views/widget/widget_message_filter.cc @@ -10,9 +10,9 @@ #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/insets.h" #include "ui/gfx/path.h" -#include "ui/views/window/non_client_view.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_hwnd_utils.h" +#include "ui/views/window/non_client_view.h" namespace views { diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc index c5c50cd..e27c08f 100644 --- a/ui/views/window/dialog_client_view.cc +++ b/ui/views/window/dialog_client_view.cc @@ -19,10 +19,10 @@ #include "ui/base/hit_test.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/native_theme/native_theme.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/root_view.h" |