diff options
Diffstat (limited to 'chrome/browser/views')
18 files changed, 23 insertions, 23 deletions
diff --git a/chrome/browser/views/bookmark_bar_instructions_view.cc b/chrome/browser/views/bookmark_bar_instructions_view.cc index c9e9487..adc708b 100644 --- a/chrome/browser/views/bookmark_bar_instructions_view.cc +++ b/chrome/browser/views/bookmark_bar_instructions_view.cc @@ -5,8 +5,8 @@ #include "chrome/browser/views/bookmark_bar_instructions_view.h" #include "app/l10n_util.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/defaults.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "grit/generated_resources.h" #include "views/controls/label.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 0c205b0..3e991d1 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -18,7 +18,6 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/metrics/user_metrics.h" @@ -29,6 +28,7 @@ #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/bookmark_context_menu.h" #include "chrome/browser/views/event_utils.h" diff --git a/chrome/browser/views/browser_actions_container.cc b/chrome/browser/views/browser_actions_container.cc index d944696..1db438f 100644 --- a/chrome/browser/views/browser_actions_container.cc +++ b/chrome/browser/views/browser_actions_container.cc @@ -11,16 +11,16 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/extension_tabs_module.h" -#include "chrome/browser/renderer_host/render_widget_host_view.h" -#include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" +#include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/detachable_toolbar_view.h" #include "chrome/browser/views/extensions/browser_action_drag_data.h" diff --git a/chrome/browser/views/detachable_toolbar_view.cc b/chrome/browser/views/detachable_toolbar_view.cc index f7664c2..796425f 100644 --- a/chrome/browser/views/detachable_toolbar_view.cc +++ b/chrome/browser/views/detachable_toolbar_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/detachable_toolbar_view.h" #include "app/resource_bundle.h" -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas_skia.h" #include "gfx/skia_util.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 7dc9d5a..7dc8fa1 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -17,9 +17,9 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/download_shelf_view.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 5c2b606..ccf51d4 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -10,11 +10,11 @@ #include "app/resource_bundle.h" #include "base/logging.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #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/view_ids.h" #include "chrome/browser/views/download_item_view.h" #include "chrome/browser/views/frame/browser_view.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index 62fa29c..0007d9c 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -11,14 +11,14 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/find_bar_controller.h" #include "chrome/browser/find_bar_state.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/view_ids.h" #include "chrome/browser/views/find_bar_host.h" #include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/view_ids.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/browser_frame_gtk.cc b/chrome/browser/views/frame/browser_frame_gtk.cc index 3a9a1ba..0b529b7 100644 --- a/chrome/browser/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/views/frame/browser_frame_gtk.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/frame/browser_frame_gtk.h" #include "base/logging.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/profile.h" #include "chrome/browser/status_bubble.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/frame/app_panel_browser_frame_view.h" #include "chrome/browser/views/frame/browser_root_view.h" #include "chrome/browser/views/frame/browser_view.h" diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc index 22fb3cc..5aad9a5 100644 --- a/chrome/browser/views/frame/browser_frame_win.cc +++ b/chrome/browser/views/frame/browser_frame_win.cc @@ -13,7 +13,7 @@ #include "base/win_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/frame/app_panel_browser_frame_view.h" #include "chrome/browser/views/frame/browser_non_client_frame_view.h" #include "chrome/browser/views/frame/browser_root_view.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 4f67d1d..79f4674 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -23,7 +23,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/dom_ui/bug_report_ui.h" #include "chrome/browser/download/download_manager.h" @@ -37,6 +36,7 @@ #include "chrome/browser/tab_contents/match_preview.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/accessible_view_helper.h" #include "chrome/browser/views/bookmark_bar_view.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index e9f6a41..b532273 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -7,7 +7,7 @@ #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/side_tab_strip.h" #include "chrome/browser/views/tabs/tab.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 514a8c7..ffb131c 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -8,8 +8,8 @@ #include "app/resource_bundle.h" #include "app/theme_provider.h" #include "base/compiler_specific.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc index 22203f8..0f29833 100644 --- a/chrome/browser/views/notifications/balloon_view.cc +++ b/chrome/browser/views/notifications/balloon_view.cc @@ -10,7 +10,6 @@ #include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -18,6 +17,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/bubble_border.h" #include "chrome/browser/views/notifications/balloon_view_host.h" #include "chrome/common/notification_details.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index 75f0e8c..9cdf889 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -13,7 +13,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas_skia.h" #include "gfx/point.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index 7a0ba17..1f58245 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -11,8 +11,8 @@ #include "app/slide_animation.h" #include "app/throb_animation.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/defaults.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" #include "gfx/font.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index adb1d6a..45b88e6 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -11,8 +11,8 @@ #include "base/compiler_specific.h" #include "base/stl_util-inl.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/defaults.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/tabs/tab.h" #include "chrome/browser/views/tabs/tab_strip_controller.h" diff --git a/chrome/browser/views/theme_background.cc b/chrome/browser/views/theme_background.cc index 06f0f6f..ad8d2ed 100644 --- a/chrome/browser/views/theme_background.cc +++ b/chrome/browser/views/theme_background.cc @@ -5,8 +5,8 @@ #include "chrome/browser/views/theme_background.h" #include "app/resource_bundle.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/profile.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/frame/browser_view.h" #include "gfx/canvas.h" #include "grit/app_resources.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 26f0768..5f919a8 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -8,10 +8,10 @@ #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/browser_actions_container.h" @@ -23,9 +23,9 @@ #include "chrome/common/pref_names.h" #include "gfx/canvas.h" #include "gfx/canvas_skia.h" +#include "gfx/skbitmap_operations.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "gfx/skbitmap_operations.h" #include "grit/theme_resources.h" #include "views/controls/button/button_dropdown.h" #include "views/focus/view_storage.h" |