diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 20:28:03 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 20:28:03 +0000 |
| commit | b071b6c6801bc5a0d2cdb174a200a85f201ce7c0 (patch) | |
| tree | 7a6e2df9cd89f3b490a540d35118555675946b99 /chrome | |
| parent | 5e3e622c221b530be9a9902f9060656848a2a7b0 (diff) | |
| download | chromium_src-b071b6c6801bc5a0d2cdb174a200a85f201ce7c0.zip chromium_src-b071b6c6801bc5a0d2cdb174a200a85f201ce7c0.tar.gz chromium_src-b071b6c6801bc5a0d2cdb174a200a85f201ce7c0.tar.bz2 | |
Move theme files in chrome/browser/ into a themes/ subdir.
Rename (and resort) every #include.
BUG=50548
TEST=compiles
Review URL: http://codereview.chromium.org/3173043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
71 files changed, 112 insertions, 111 deletions
diff --git a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc index 2878eae..cd3f208 100644 --- a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc +++ b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc @@ -9,8 +9,8 @@ #include "app/theme_provider.h" #include "base/command_line.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/cocoa/background_gradient_view.mm b/chrome/browser/cocoa/background_gradient_view.mm index 7dd93b6..9910412 100644 --- a/chrome/browser/cocoa/background_gradient_view.mm +++ b/chrome/browser/cocoa/background_gradient_view.mm @@ -4,8 +4,8 @@ #include "chrome/browser/cocoa/background_gradient_view.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/themed_window.h" +#import "chrome/browser/themes/browser_theme_provider.h" #include "grit/theme_resources.h" #define kToolbarTopOffset 12 diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm index 14fdecb..245f599 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_controller.mm @@ -12,7 +12,6 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/background_gradient_view.h" #import "chrome/browser/cocoa/bookmark_bar_bridge.h" #import "chrome/browser/cocoa/bookmark_bar_constants.h" @@ -41,6 +40,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#import "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/pref_names.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm index ddd0670..34cfd20 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm @@ -3,20 +3,21 @@ // found in the LICENSE file. #import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" + #include "base/mac_util.h" #include "base/nsimage_cache_mac.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/bookmark_bar_constants.h" // namespace bookmarks #import "chrome/browser/cocoa/bookmark_bar_controller.h" // namespace bookmarks -#import "chrome/browser/cocoa/bookmark_bar_folder_view.h" #import "chrome/browser/cocoa/bookmark_bar_folder_button_cell.h" #import "chrome/browser/cocoa/bookmark_bar_folder_hover_state.h" +#import "chrome/browser/cocoa/bookmark_bar_folder_view.h" #import "chrome/browser/cocoa/bookmark_folder_target.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/event_utils.h" +#import "chrome/browser/themes/browser_theme_provider.h" namespace { diff --git a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm b/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm index 9f50222..f2c8494 100644 --- a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm @@ -6,12 +6,12 @@ #include "app/theme_provider.h" #include "gfx/rect.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/bookmark_bar_constants.h" #import "chrome/browser/cocoa/bookmark_bar_controller.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/themed_window.h" #include "chrome/browser/ntp_background_util.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas_skia_paint.h" const CGFloat kBorderRadius = 3.0; diff --git a/chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm b/chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm index eaf3a34..0b5a1cc 100644 --- a/chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm +++ b/chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm @@ -6,10 +6,10 @@ #include "app/theme_provider.h" #include "base/scoped_nsobject.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/bookmark_bar_controller.h" #import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/bookmark_bar_view.mm b/chrome/browser/cocoa/bookmark_bar_view.mm index 2098521..63e3c3c 100644 --- a/chrome/browser/cocoa/bookmark_bar_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_view.mm @@ -5,12 +5,12 @@ #import "chrome/browser/cocoa/bookmark_bar_view.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/bookmark_bar_controller.h" #import "chrome/browser/cocoa/bookmark_button.h" #import "chrome/browser/cocoa/bookmark_folder_target.h" #import "chrome/browser/cocoa/themed_window.h" #import "chrome/browser/cocoa/view_id_util.h" +#import "chrome/browser/themes/browser_theme_provider.h" #import "third_party/mozilla/NSPasteboard+Utils.h" @interface BookmarkBarView (Private) diff --git a/chrome/browser/cocoa/browser_frame_view.mm b/chrome/browser/cocoa/browser_frame_view.mm index dfc8003..1c07ab8 100644 --- a/chrome/browser/cocoa/browser_frame_view.mm +++ b/chrome/browser/cocoa/browser_frame_view.mm @@ -9,9 +9,9 @@ #include "base/logging.h" #include "base/scoped_nsautorelease_pool.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/chrome_browser_window.h" #import "chrome/browser/cocoa/themed_window.h" +#import "chrome/browser/themes/browser_theme_provider.h" #include "grit/theme_resources.h" static const CGFloat kBrowserFrameViewPaintHeight = 60.0; diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index d9373a8..0e18570 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -14,15 +14,9 @@ #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" // IDC_* +#include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_theme_provider.h" -#include "chrome/browser/dock_info.h" -#include "chrome/browser/encoding_menu_controller.h" -#include "chrome/browser/location_bar.h" -#include "chrome/browser/profile.h" -#include "chrome/browser/window_sizer.h" -#include "chrome/browser/bookmarks/bookmark_editor.h" #import "chrome/browser/cocoa/background_gradient_view.h" #import "chrome/browser/cocoa/bookmark_bar_controller.h" #import "chrome/browser/cocoa/bookmark_editor_controller.h" @@ -31,8 +25,8 @@ #import "chrome/browser/cocoa/download_shelf_controller.h" #import "chrome/browser/cocoa/event_utils.h" #import "chrome/browser/cocoa/fast_resize_view.h" -#import "chrome/browser/cocoa/find_bar_cocoa_controller.h" #import "chrome/browser/cocoa/find_bar_bridge.h" +#import "chrome/browser/cocoa/find_bar_cocoa_controller.h" #import "chrome/browser/cocoa/focus_tracker.h" #import "chrome/browser/cocoa/fullscreen_controller.h" #import "chrome/browser/cocoa/fullscreen_window.h" @@ -41,18 +35,24 @@ #import "chrome/browser/cocoa/sad_tab_controller.h" #import "chrome/browser/cocoa/status_bubble_mac.h" #import "chrome/browser/cocoa/tab_contents_controller.h" -#import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h" #import "chrome/browser/cocoa/tab_strip_controller.h" +#import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h" #import "chrome/browser/cocoa/tab_strip_view.h" #import "chrome/browser/cocoa/tab_view.h" #import "chrome/browser/cocoa/tabpose_window.h" #import "chrome/browser/cocoa/toolbar_controller.h" +#include "chrome/browser/dock_info.h" +#include "chrome/browser/encoding_menu_controller.h" +#include "chrome/browser/location_bar.h" +#include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util_mac.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view_mac.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/window_sizer.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/cocoa/browser_window_controller_private.mm b/chrome/browser/cocoa/browser_window_controller_private.mm index c4615d5..dcb73da 100644 --- a/chrome/browser/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/cocoa/browser_window_controller_private.mm @@ -9,7 +9,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" #import "chrome/browser/cocoa/chrome_browser_window.h" #import "chrome/browser/cocoa/fast_resize_view.h" #import "chrome/browser/cocoa/find_bar_cocoa_controller.h" @@ -24,6 +23,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view.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/common/pref_names.h" namespace { diff --git a/chrome/browser/cocoa/bubble_view.mm b/chrome/browser/cocoa/bubble_view.mm index 9c5f569..e7815b8 100644 --- a/chrome/browser/cocoa/bubble_view.mm +++ b/chrome/browser/cocoa/bubble_view.mm @@ -4,8 +4,8 @@ #import "chrome/browser/cocoa/bubble_view.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/themed_window.h" +#include "chrome/browser/themes/browser_theme_provider.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" diff --git a/chrome/browser/cocoa/chrome_browser_window.mm b/chrome/browser/cocoa/chrome_browser_window.mm index 25826a3..9e0df76 100644 --- a/chrome/browser/cocoa/chrome_browser_window.mm +++ b/chrome/browser/cocoa/chrome_browser_window.mm @@ -5,13 +5,13 @@ #import "chrome/browser/cocoa/chrome_browser_window.h" #include "base/logging.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/browser_frame_view.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/themed_window.h" #include "chrome/browser/global_keyboard_shortcuts_mac.h" #import "chrome/browser/renderer_host/render_widget_host_view_mac.h" +#include "chrome/browser/themes/browser_theme_provider.h" namespace { // Size of the gradient. Empirically determined so that the gradient looks diff --git a/chrome/browser/cocoa/download_item_cell.mm b/chrome/browser/cocoa/download_item_cell.mm index 1338615..935108f 100644 --- a/chrome/browser/cocoa/download_item_cell.mm +++ b/chrome/browser/cocoa/download_item_cell.mm @@ -8,7 +8,6 @@ #include "app/text_elider.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/download_item_cell.h" #import "chrome/browser/cocoa/image_utils.h" #import "chrome/browser/cocoa/themed_window.h" @@ -16,6 +15,7 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/download_util.h" +#import "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas_skia_paint.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm index 86cab8d..e13fc74 100644 --- a/chrome/browser/cocoa/download_item_controller.mm +++ b/chrome/browser/cocoa/download_item_controller.mm @@ -12,7 +12,6 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/download_item_button.h" #import "chrome/browser/cocoa/download_item_cell.h" #include "chrome/browser/cocoa/download_item_mac.h" @@ -23,6 +22,7 @@ #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/download/download_util.h" +#import "chrome/browser/themes/browser_theme_provider.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/cocoa/download_shelf_controller.mm b/chrome/browser/cocoa/download_shelf_controller.mm index e0095ba..715fcfa 100644 --- a/chrome/browser/cocoa/download_shelf_controller.mm +++ b/chrome/browser/cocoa/download_shelf_controller.mm @@ -9,10 +9,9 @@ #include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/animatable_view.h" -#import "chrome/browser/cocoa/browser_window_controller.h" #include "chrome/browser/cocoa/browser_window_cocoa.h" +#import "chrome/browser/cocoa/browser_window_controller.h" #include "chrome/browser/cocoa/download_item_controller.h" #include "chrome/browser/cocoa/download_shelf_mac.h" #import "chrome/browser/cocoa/download_shelf_view.h" @@ -20,6 +19,7 @@ #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/profile.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/cocoa/download_shelf_view.mm b/chrome/browser/cocoa/download_shelf_view.mm index bd43cf5..b382037 100644 --- a/chrome/browser/cocoa/download_shelf_view.mm +++ b/chrome/browser/cocoa/download_shelf_view.mm @@ -5,9 +5,9 @@ #import "chrome/browser/cocoa/download_shelf_view.h" #include "base/scoped_nsobject.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/themed_window.h" #import "chrome/browser/cocoa/view_id_util.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "grit/theme_resources.h" @implementation DownloadShelfView diff --git a/chrome/browser/cocoa/fullscreen_window.mm b/chrome/browser/cocoa/fullscreen_window.mm index 4fd2be1..15c2ee8 100644 --- a/chrome/browser/cocoa/fullscreen_window.mm +++ b/chrome/browser/cocoa/fullscreen_window.mm @@ -5,8 +5,8 @@ #import "chrome/browser/cocoa/fullscreen_window.h" #include "base/mac_util.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/themed_window.h" +#include "chrome/browser/themes/browser_theme_provider.h" @implementation FullscreenWindow diff --git a/chrome/browser/cocoa/gradient_button_cell.mm b/chrome/browser/cocoa/gradient_button_cell.mm index ed8408e..d5b40b9 100644 --- a/chrome/browser/cocoa/gradient_button_cell.mm +++ b/chrome/browser/cocoa/gradient_button_cell.mm @@ -6,9 +6,9 @@ #include "base/logging.h" #import "base/scoped_nsobject.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/image_utils.h" #import "chrome/browser/cocoa/themed_window.h" +#import "chrome/browser/themes/browser_theme_provider.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" diff --git a/chrome/browser/cocoa/infobar_gradient_view.mm b/chrome/browser/cocoa/infobar_gradient_view.mm index 1dc0b7c..180a286 100644 --- a/chrome/browser/cocoa/infobar_gradient_view.mm +++ b/chrome/browser/cocoa/infobar_gradient_view.mm @@ -5,8 +5,8 @@ #include "chrome/browser/cocoa/infobar_gradient_view.h" #include "base/scoped_nsobject.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/themed_window.h" +#import "chrome/browser/themes/browser_theme_provider.h" namespace { diff --git a/chrome/browser/cocoa/styled_text_field_cell.mm b/chrome/browser/cocoa/styled_text_field_cell.mm index 5a3415a..43a2a39 100644 --- a/chrome/browser/cocoa/styled_text_field_cell.mm +++ b/chrome/browser/cocoa/styled_text_field_cell.mm @@ -6,8 +6,8 @@ #include "app/resource_bundle.h" #include "base/logging.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/themed_window.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/font.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/cocoa/tab_controller.mm b/chrome/browser/cocoa/tab_controller.mm index 040f9d6..9e5403c 100644 --- a/chrome/browser/cocoa/tab_controller.mm +++ b/chrome/browser/cocoa/tab_controller.mm @@ -4,12 +4,12 @@ #include "app/l10n_util_mac.h" #include "base/mac_util.h" -#import "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/menu_controller.h" #import "chrome/browser/cocoa/tab_controller.h" #import "chrome/browser/cocoa/tab_controller_target.h" #import "chrome/browser/cocoa/tab_view.h" #import "chrome/browser/cocoa/themed_window.h" +#import "chrome/browser/themes/browser_theme_provider.h" #import "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/tab_strip_view.mm b/chrome/browser/cocoa/tab_strip_view.mm index 8f4ce26..1e0daf8 100644 --- a/chrome/browser/cocoa/tab_strip_view.mm +++ b/chrome/browser/cocoa/tab_strip_view.mm @@ -4,12 +4,12 @@ #import "chrome/browser/cocoa/tab_strip_view.h" +#include "base/logging.h" #include "base/mac_util.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/view_id_util.h" -#include "base/logging.h" +#include "chrome/browser/themes/browser_theme_provider.h" @implementation TabStripView diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm index 8afb68c..e2d7d49 100644 --- a/chrome/browser/cocoa/tab_view.mm +++ b/chrome/browser/cocoa/tab_view.mm @@ -8,11 +8,11 @@ #import "base/mac_util.h" #include "base/nsimage_cache_mac.h" #include "base/scoped_cftyperef.h" -#include "chrome/browser/browser_theme_provider.h" #import "chrome/browser/cocoa/tab_controller.h" #import "chrome/browser/cocoa/tab_window_controller.h" #import "chrome/browser/cocoa/themed_window.h" #import "chrome/browser/cocoa/view_id_util.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "grit/theme_resources.h" namespace { diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index 57b0e38..edbdcbd 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -17,7 +17,6 @@ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/browser_window.h" #import "chrome/browser/cocoa/accelerators_cocoa.h" #import "chrome/browser/cocoa/back_forward_menu_controller.h" @@ -40,6 +39,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/toolbar_model.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/browser/wrench_menu_model.h" diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index d0d4e80..f2f8b36 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -10,7 +10,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/browser_window.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_window.h" @@ -24,6 +23,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc index c9e9c88..0ecc7ae 100644 --- a/chrome/browser/dom_ui/dom_ui.cc +++ b/chrome/browser/dom_ui/dom_ui.cc @@ -10,11 +10,11 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/profile.h" #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/themes/browser_theme_provider.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.cc b/chrome/browser/dom_ui/dom_ui_theme_source.cc index e2ecbdf..d2a91ba0ae 100644 --- a/chrome/browser/dom_ui/dom_ui_theme_source.cc +++ b/chrome/browser/dom_ui/dom_ui_theme_source.cc @@ -8,11 +8,11 @@ #include "app/theme_provider.h" #include "base/message_loop.h" #include "base/ref_counted_memory.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/ntp_resource_cache.h" #include "chrome/browser/profile.h" #include "chrome/browser/resources_util.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc index e3ceeef..54888b1 100644 --- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc +++ b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/ref_counted_memory.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/dom_ui_theme_source.h" #include "chrome/browser/profile.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_profile.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index 15a2016..bcef31d 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -18,12 +18,12 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/google_util.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index c7964b6..1f26277 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -15,7 +15,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/browsing_instance.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/dom_ui/dom_ui_factory.h" @@ -28,24 +27,25 @@ #include "chrome/browser/platform_util.h" #include "chrome/browser/pref_service.h" #include "chrome/browser/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_process_host.h" +#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/renderer_preferences_util.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/common/bindings_policy.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/view_types.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" +#include "chrome/common/view_types.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "webkit/glue/context_menu.h" diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 4fb501d..6d00c22 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -9,10 +9,10 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index a28abed..3f50b49 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -4,9 +4,9 @@ #include "chrome/browser/gtk/browser_toolbar_gtk.h" +#include <X11/XF86keysym.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <X11/XF86keysym.h> #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" @@ -19,7 +19,6 @@ #include "base/singleton.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/gtk/accelerators_gtk.h" #include "chrome/browser/gtk/back_forward_button_gtk.h" @@ -39,6 +38,7 @@ #include "chrome/browser/pref_service.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/upgrade_detector.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index c9950ff..934a04c 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -28,7 +28,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/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" @@ -74,6 +73,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_gtk.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/window_sizer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/native_web_keyboard_event.h" diff --git a/chrome/browser/gtk/gtk_theme_provider.h b/chrome/browser/gtk/gtk_theme_provider.h index c78aaa3..33b1ec2 100644 --- a/chrome/browser/gtk/gtk_theme_provider.h +++ b/chrome/browser/gtk/gtk_theme_provider.h @@ -12,8 +12,8 @@ #include "app/gtk_integers.h" #include "app/gtk_signal.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/gtk/owned_widget_gtk.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/notification_observer.h" #include "gfx/color_utils.h" diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/gtk/notifications/balloon_view_gtk.cc index f447c75..717a560 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.cc @@ -15,7 +15,6 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" @@ -32,6 +31,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/common/extensions/extension.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc index 96aae10..27a1846 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_gtk.cc +++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.cc @@ -10,7 +10,6 @@ #include "app/x11_util.h" #include "base/i18n/rtl.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h" #include "chrome/browser/profile.h" @@ -18,6 +17,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/gtk_util.h" #include "third_party/skia/include/core/SkShader.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 696896f8..0f29263 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -12,7 +12,6 @@ #include "base/i18n/rtl.h" #include "base/string_util.h" #include "chrome/browser/autocomplete/autocomplete.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/gtk_theme_provider.h" @@ -20,6 +19,7 @@ #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "gfx/gtk_util.h" diff --git a/chrome/browser/ntp_background_util.cc b/chrome/browser/ntp_background_util.cc index b36ce9f..b3926d5 100644 --- a/chrome/browser/ntp_background_util.cc +++ b/chrome/browser/ntp_background_util.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ntp_background_util.h" #include "base/logging.h" -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas.h" #include "gfx/rect.h" #include "gfx/skia_util.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 116b645..15a4641 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -14,7 +14,6 @@ #include "chrome/browser/background_contents_service.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/find_bar_state.h" @@ -23,6 +22,7 @@ #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/ssl/ssl_host_state.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc index 4d976d0..55a3f76 100644 --- a/chrome/browser/profile_impl.cc +++ b/chrome/browser/profile_impl.cc @@ -22,7 +22,6 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_prefs.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/ntp_resource_cache.h" #include "chrome/browser/download/download_manager.h" @@ -36,8 +35,6 @@ #include "chrome/browser/find_bar_state.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_permission_context.h" -#include "chrome/browser/spellcheck_host.h" -#include "chrome/browser/transport_security_persister.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/host_content_settings_map.h" @@ -56,16 +53,19 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/tab_restore_service.h" +#include "chrome/browser/spellcheck_host.h" #include "chrome/browser/ssl/ssl_host_state.h" #include "chrome/browser/status_icons/status_tray.h" -#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_factory_impl.h" +#include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/tabs/pinned_tab_service.h" +#include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/transport_security_persister.h" #include "chrome/browser/user_style_sheet_watcher.h" -#include "chrome/browser/visitedlink_master.h" #include "chrome/browser/visitedlink_event_listener.h" -#include "chrome/browser/webdata/web_data_service.h" +#include "chrome/browser/visitedlink_master.h" #include "chrome/browser/web_resource/web_resource_service.h" +#include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/sync/glue/theme_change_processor.cc b/chrome/browser/sync/glue/theme_change_processor.cc index 58c3df3..bdf5e47 100644 --- a/chrome/browser/sync/glue/theme_change_processor.cc +++ b/chrome/browser/sync/glue/theme_change_processor.cc @@ -5,11 +5,11 @@ #include "chrome/browser/sync/glue/theme_change_processor.h" #include "base/logging.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/glue/theme_util.h" #include "chrome/browser/sync/protocol/theme_specifics.pb.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc index 3936f62..2dd02c2 100644 --- a/chrome/browser/sync/glue/theme_model_associator.cc +++ b/chrome/browser/sync/glue/theme_model_associator.cc @@ -7,12 +7,12 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/sync/engine/syncapi.h" #include "chrome/browser/sync/glue/sync_backend_host.h" #include "chrome/browser/sync/glue/theme_util.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/protocol/theme_specifics.pb.h" +#include "chrome/browser/themes/browser_theme_provider.h" namespace browser_sync { diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 082f1a8..1934700 100644 --- a/chrome/browser/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_theme_pack.h" +#include "chrome/browser/themes/browser_theme_pack.h" #include "app/resource_bundle.h" #include "base/data_pack.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/codec/png_codec.h" #include "gfx/skbitmap_operations.h" #include "grit/app_resources.h" diff --git a/chrome/browser/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index c5b20eb..85d27af 100644 --- a/chrome/browser/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_BROWSER_THEME_PACK_H_ -#define CHROME_BROWSER_BROWSER_THEME_PACK_H_ +#ifndef CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_ +#define CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_ #pragma once #include <map> @@ -223,4 +223,4 @@ class BrowserThemePack : public base::RefCountedThreadSafe<BrowserThemePack> { DISALLOW_COPY_AND_ASSIGN(BrowserThemePack); }; -#endif // CHROME_BROWSER_BROWSER_THEME_PACK_H_ +#endif // CHROME_BROWSER_THEMES_BROWSER_THEME_PACK_H_ diff --git a/chrome/browser/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index eaeba79..9fae131 100644 --- a/chrome/browser/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_theme_pack.h" +#include "chrome/browser/themes/browser_theme_pack.h" #include "base/file_util.h" #include "base/json/json_reader.h" @@ -10,8 +10,8 @@ #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/values.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/json_value_serializer.h" #include "gfx/color_utils.h" diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/themes/browser_theme_provider.cc index 4964bdd..74bddfa 100644 --- a/chrome/browser/browser_theme_provider.cc +++ b/chrome/browser/themes/browser_theme_provider.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "app/resource_bundle.h" -#include "base/utf_string_conversions.h" #include "base/string_util.h" -#include "chrome/browser/browser_theme_pack.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" +#include "chrome/browser/themes/browser_theme_pack.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/browser_theme_provider.h b/chrome/browser/themes/browser_theme_provider.h index 9381ae2..565047e 100644 --- a/chrome/browser/browser_theme_provider.h +++ b/chrome/browser/themes/browser_theme_provider.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_ -#define CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_ +#ifndef CHROME_BROWSER_THEMES_BROWSER_THEME_PROVIDER_H_ +#define CHROME_BROWSER_THEMES_BROWSER_THEME_PROVIDER_H_ #pragma once #include <map> @@ -272,4 +272,4 @@ class BrowserThemeProvider : public NonThreadSafe, DISALLOW_COPY_AND_ASSIGN(BrowserThemeProvider); }; -#endif // CHROME_BROWSER_BROWSER_THEME_PROVIDER_H_ +#endif // CHROME_BROWSER_THEMES_BROWSER_THEME_PROVIDER_H_ diff --git a/chrome/browser/browser_theme_provider_gtk.cc b/chrome/browser/themes/browser_theme_provider_gtk.cc index 8052086..a730f3b 100644 --- a/chrome/browser/browser_theme_provider_gtk.cc +++ b/chrome/browser/themes/browser_theme_provider_gtk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include <gdk-pixbuf/gdk-pixbuf.h> diff --git a/chrome/browser/browser_theme_provider_mac.mm b/chrome/browser/themes/browser_theme_provider_mac.mm index edac255..0ad2674 100644 --- a/chrome/browser/browser_theme_provider_mac.mm +++ b/chrome/browser/themes/browser_theme_provider_mac.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #import <Cocoa/Cocoa.h> #include "base/logging.h" -#include "chrome/browser/browser_theme_pack.h" +#include "chrome/browser/themes/browser_theme_pack.h" #include "gfx/color_utils.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" diff --git a/chrome/browser/browser_theme_provider_unittest.cc b/chrome/browser/themes/browser_theme_provider_unittest.cc index e5f7235..c99a946 100644 --- a/chrome/browser/browser_theme_provider_unittest.cc +++ b/chrome/browser/themes/browser_theme_provider_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_theme_provider.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "testing/gtest/include/gtest/gtest.h" #include "base/json/json_reader.h" 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" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 73c8a8e..ba8328b 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -307,12 +307,12 @@ 'browser/browser_process_sub_thread.h', 'browser/browser_shutdown.cc', 'browser/browser_shutdown.h', - 'browser/browser_theme_pack.cc', - 'browser/browser_theme_pack.h', - 'browser/browser_theme_provider_gtk.cc', - 'browser/browser_theme_provider_mac.mm', - 'browser/browser_theme_provider.cc', - 'browser/browser_theme_provider.h', + 'browser/themes/browser_theme_pack.cc', + 'browser/themes/browser_theme_pack.h', + 'browser/themes/browser_theme_provider_gtk.cc', + 'browser/themes/browser_theme_provider_mac.mm', + 'browser/themes/browser_theme_provider.cc', + 'browser/themes/browser_theme_provider.h', 'browser/browser_trial.cc', 'browser/browser_trial.h', 'browser/browser_url_handler.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ffe4851..d2c1e2e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -843,8 +843,8 @@ 'browser/browser_about_handler_unittest.cc', 'browser/browser_accessibility_win_unittest.cc', 'browser/browser_commands_unittest.cc', - 'browser/browser_theme_pack_unittest.cc', - 'browser/browser_theme_provider_unittest.cc', + 'browser/themes/browser_theme_pack_unittest.cc', + 'browser/themes/browser_theme_provider_unittest.cc', 'browser/browsing_data_appcache_helper_unittest.cc', 'browser/browsing_data_database_helper_unittest.cc', 'browser/browsing_data_local_storage_helper_unittest.cc', diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 27bb9ef..445c022 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -15,7 +15,6 @@ #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_prefs.h" -#include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/dom_ui/ntp_resource_cache.h" #include "chrome/browser/favicon_service.h" @@ -25,13 +24,14 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/top_sites.h" -#include "chrome/browser/in_process_webkit/webkit_context.h" #include "chrome/browser/host_content_settings_map.h" +#include "chrome/browser/in_process_webkit/webkit_context.h" #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/profile_sync_service_mock.h" +#include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/notification_service.h" |