diff options
Diffstat (limited to 'chrome/browser/views')
38 files changed, 38 insertions, 38 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 033e136..2241641 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -11,7 +11,7 @@ #include "base/win_util.h" #include "base/word_iterator.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index e961a8c..bde9f3a 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -12,7 +12,7 @@ #include <math.h> -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index f1f8d3e..7deb438 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/base_drag_source.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index ac8d572..cd6b9c9 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/bookmark_bubble_view.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 7d5faa1..3c1d78f 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -6,7 +6,7 @@ #include "base/gfx/rect.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 6579e55..9788278 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -8,7 +8,7 @@ #include "base/file_util.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index d4e02ed..7eec963 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc index 3d91712..2ea0cdd 100644 --- a/chrome/browser/views/download_started_animation.cc +++ b/chrome/browser/views/download_started_animation.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/download_started_animation.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc index 3b35e6e..a033cd1 100644 --- a/chrome/browser/views/download_tab_view.cc +++ b/chrome/browser/views/download_tab_view.cc @@ -14,7 +14,7 @@ #include "base/task.h" #include "base/time_format.h" #include "base/timer.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 1c3c95f..7b66208 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/edit_keyword_controller.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index a8fcf1e..5aa6088 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -7,7 +7,7 @@ #include <algorithm> #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/find_bar_win.h" #include "chrome/browser/view_ids.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index b023095..2e50325 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/first_run_customize_view.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index cfafb6b..810a31c 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/first_run_view.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index 1a108c7..57fdf0a 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -8,7 +8,7 @@ #include "base/path_service.h" #include "base/ref_counted.h" #include "base/thread.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run.h" diff --git a/chrome/browser/views/frame/aero_glass_frame.cc b/chrome/browser/views/frame/aero_glass_frame.cc index 876ef4e..78cda9f 100644 --- a/chrome/browser/views/frame/aero_glass_frame.cc +++ b/chrome/browser/views/frame/aero_glass_frame.cc @@ -6,7 +6,7 @@ #include <dwmapi.h> -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/frame/aero_glass_non_client_view.h" diff --git a/chrome/browser/views/frame/aero_glass_non_client_view.cc b/chrome/browser/views/frame/aero_glass_non_client_view.cc index 82bccfc..077fb31 100644 --- a/chrome/browser/views/frame/aero_glass_non_client_view.cc +++ b/chrome/browser/views/frame/aero_glass_non_client_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/frame/aero_glass_non_client_view.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 8ccb3e5..5111358 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -9,7 +9,7 @@ #include "base/file_version_info.h" #include "base/time.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc index 0066806..e007a83 100644 --- a/chrome/browser/views/frame/opaque_non_client_view.cc +++ b/chrome/browser/views/frame/opaque_non_client_view.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/frame/opaque_non_client_view.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/gfx/chrome_font.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 7e0b3df..fa72cc9 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/hung_renderer_view.h" #include "chrome/app/result_codes.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index ebee987..e41f45c 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/info_bubble.h" #include "base/win_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/gfx/chrome_canvas.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index bee39af..f8dea76 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/infobars/infobars.h" #include "base/message_loop.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" #include "chrome/common/l10n_util.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 986ce09..aa30c89 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -9,7 +9,7 @@ #include "base/gfx/png_decoder.h" #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index ad6b15a..f5abaa0 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -7,7 +7,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/alternate_nav_url_fetcher.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 579158e8..5ca51cb 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/views/options/fonts_languages_window_view.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index f1af2d8..f33f104 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/time_format.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/color_utils.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index d73191b..3f41bbd 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index e8f19f5..ae81849 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/thread.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 62bcf81..0252d7d 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/spellchecker.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index e919851..77f4847 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -10,7 +10,7 @@ #include "base/string_util.h" #include "base/time_format.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 7ec0ec1..0eb5104 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/sad_tab_view.h" #include "base/gfx/size.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index 215e73b..a0544eb 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -7,7 +7,7 @@ #include "base/gfx/png_decoder.h" #include "base/string_util.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/star_toggle.cc b/chrome/browser/views/star_toggle.cc index 2a16a20..6e16653 100644 --- a/chrome/browser/views/star_toggle.cc +++ b/chrome/browser/views/star_toggle.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/star_toggle.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index a811892..31ae020 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/animation.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 8f624ac..61723fac 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -9,7 +9,7 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index e008d0d..84a68ad 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,7 +6,7 @@ #include "chrome/browser/views/tabs/tab_renderer.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 243bfa9..693ba35 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "base/gfx/size.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/views/toolbar_star_toggle.cc b/chrome/browser/views/toolbar_star_toggle.cc index 7e43b2e..e4a017f 100644 --- a/chrome/browser/views/toolbar_star_toggle.cc +++ b/chrome/browser/views/toolbar_star_toggle.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/toolbar_star_toggle.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/views/bookmark_bubble_view.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 36cd68d..03725e0 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" |