diff options
Diffstat (limited to 'chrome/browser/ui/views')
60 files changed, 61 insertions, 61 deletions
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index c01eb07..c002142 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -13,7 +13,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" @@ -36,6 +35,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/textfield/textfield.h" #include "views/controls/throbber.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc index 51d589a..f7f15f1 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/i18n/bidi_line_iterator.h" #include "base/i18n/rtl.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/base/theme_provider.h" #include "unicode/ubidi.h" diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index f013d83..8708694 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -8,7 +8,6 @@ #include <vssym32.h> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -34,6 +33,7 @@ #include "grit/theme_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/border.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index ede1b44..19ecaa6 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -42,6 +41,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/controls/button/menu_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc index 0f55895..4d582b3 100644 --- a/chrome/browser/ui/views/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmark_bubble_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/bookmark_bubble_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "views/event.h" #include "views/standard_layout.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmark_menu_controller_views.cc index 6f761d0..a114a8b 100644 --- a/chrome/browser/ui/views/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmark_menu_controller_views.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/bookmark_menu_controller_views.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_node_data.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" using views::MenuItemView; diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 817dc7c..e90d5bd 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/browser_actions_container.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -38,6 +37,7 @@ #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/text_button.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/views/bubble_border.cc b/chrome/browser/ui/views/bubble_border.cc index c0c1642..56bc303 100644 --- a/chrome/browser/ui/views/bubble_border.cc +++ b/chrome/browser/ui/views/bubble_border.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/views/bubble_border.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "gfx/canvas_skia.h" #include "gfx/path.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" // static SkBitmap* BubbleBorder::left_ = NULL; diff --git a/chrome/browser/ui/views/clear_server_data.cc b/chrome/browser/ui/views/clear_server_data.cc index b506415..d686d8b 100644 --- a/chrome/browser/ui/views/clear_server_data.cc +++ b/chrome/browser/ui/views/clear_server_data.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/clear_server_data.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -19,6 +18,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index b939cf5..0dfe571 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/collected_cookies_win.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -15,6 +14,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/box_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc index 920be4b..e669319 100644 --- a/chrome/browser/ui/views/constrained_window_win.cc +++ b/chrome/browser/ui/views/constrained_window_win.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "app/win/win_util.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "views/controls/button/image_button.h" #include "views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index dcbe13f..19deb29 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/create_application_shortcut_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" @@ -25,6 +24,7 @@ #include "net/url_request/url_request.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/checkbox.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index edea15e..eb4af7b 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" @@ -19,6 +18,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/message_box_flags.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/detachable_toolbar_view.cc b/chrome/browser/ui/views/detachable_toolbar_view.cc index 09be69b..8faf5e1 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.cc +++ b/chrome/browser/ui/views/detachable_toolbar_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/detachable_toolbar_view.h" -#include "app/resource_bundle.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "gfx/canvas_skia.h" #include "gfx/skia_util.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/window/non_client_view.h" // How round the 'new tab' style bookmarks bar is. diff --git a/chrome/browser/ui/views/download_item_view.cc b/chrome/browser/ui/views/download_item_view.cc index 155cc09..6a97104 100644 --- a/chrome/browser/ui/views/download_item_view.cc +++ b/chrome/browser/ui/views/download_item_view.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/file_path.h" #include "base/i18n/rtl.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/controls/button/native_button.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/views/download_shelf_view.cc b/chrome/browser/ui/views/download_shelf_view.cc index 9701df5..de3a845 100644 --- a/chrome/browser/ui/views/download_shelf_view.cc +++ b/chrome/browser/ui/views/download_shelf_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/download_item.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/download_started_animation_win.cc b/chrome/browser/ui/views/download_started_animation_win.cc index cbcbc97..8b6146f 100644 --- a/chrome/browser/ui/views/download_started_animation_win.cc +++ b/chrome/browser/ui/views/download_started_animation_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/download/download_started_animation.h" -#include "app/resource_bundle.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_registrar.h" @@ -12,6 +11,7 @@ #include "gfx/rect.h" #include "grit/theme_resources.h" #include "ui/base/animation/linear_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 7372379..45d1249 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/edit_search_engine_dialog.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -15,6 +14,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/controls/image_view.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index 7cc35db..2ebf514 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -24,6 +23,7 @@ #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index e992f2a..b189cbd 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index 299a9a6..b1b2d84 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/first_run_bubble.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" @@ -18,6 +17,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_font_util.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "views/event.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc index 275b891..63b7e2a 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -9,7 +9,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/rand_util.h" #include "base/time.h" @@ -27,6 +26,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index 8838a8d..9c0707a 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -18,6 +17,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/window/window.h" #include "views/window/window_resources.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index c0d454e..de9afc7 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -9,7 +9,6 @@ #endif #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" @@ -74,6 +73,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "grit/webkit_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/single_split_view.h" #include "views/focus/external_focus_tracker.h" #include "views/focus/view_storage.h" diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index 8e74eae..172e4b5 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" -#include "app/resource_bundle.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/themes/browser_theme_provider.h" @@ -16,6 +15,7 @@ #include "gfx/icon_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/window/client_view.h" #include "views/window/window_resources.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 9070699..60e960ab 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -21,6 +20,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble.cc b/chrome/browser/ui/views/fullscreen_exit_bubble.cc index 2e59e6b..485669c 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble.cc @@ -5,13 +5,13 @@ #include "chrome/browser/ui/views/fullscreen_exit_bubble.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/resource/resource_bundle.h" #include "views/screen.h" #include "views/widget/root_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index f6f60f5..fa6a139 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/hung_renderer_dialog.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -19,6 +18,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/grid_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc index 56a610c..a48ee2d 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.cc +++ b/chrome/browser/ui/views/infobars/extension_infobar.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/infobars/extension_infobar.h" -#include "app/resource_bundle.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/extensions/extension_infobar_delegate.h" #include "chrome/browser/extensions/extension_host.h" @@ -16,6 +15,7 @@ #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_2.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/infobars/infobar_button_border.cc b/chrome/browser/ui/views/infobars/infobar_button_border.cc index ef69d71..da0c2fa 100644 --- a/chrome/browser/ui/views/infobars/infobar_button_border.cc +++ b/chrome/browser/ui/views/infobars/infobar_button_border.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/infobars/infobar_button_border.h" -#include "app/resource_bundle.h" #include "gfx/canvas.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/text_button.h" // Preferred padding between text and edge diff --git a/chrome/browser/ui/views/infobars/infobar_text_button.cc b/chrome/browser/ui/views/infobars/infobar_text_button.cc index ec1803d..9c956c4 100644 --- a/chrome/browser/ui/views/infobars/infobar_text_button.cc +++ b/chrome/browser/ui/views/infobars/infobar_text_button.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/infobars/infobar_button_border.h" +#include "ui/base/resource/resource_bundle.h" // static InfoBarTextButton* InfoBarTextButton::Create(views::ButtonListener* listener, diff --git a/chrome/browser/ui/views/infobars/infobars.cc b/chrome/browser/ui/views/infobars/infobars.cc index af97d7e..7ac5cec 100644 --- a/chrome/browser/ui/views/infobars/infobars.cc +++ b/chrome/browser/ui/views/infobars/infobars.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/infobars/infobars.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/event_utils.h" @@ -15,6 +14,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/infobars/translate_infobar_base.cc b/chrome/browser/ui/views/infobars/translate_infobar_base.cc index cb8b974..ecba1fe 100644 --- a/chrome/browser/ui/views/infobars/translate_infobar_base.cc +++ b/chrome/browser/ui/views/infobars/translate_infobar_base.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/infobars/translate_infobar_base.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/views/infobars/after_translate_infobar.h" @@ -14,6 +13,7 @@ #include "gfx/canvas_skia.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc index 40bfff8..a946a3a1 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_setting_bubble_model.h" @@ -19,6 +18,7 @@ #include "gfx/canvas_skia.h" #include "gfx/skia_util.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/resource/resource_bundle.h" #include "views/border.h" namespace { diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index 696f733..cd98835 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h" -#include "app/resource_bundle.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "gfx/canvas.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index 4b1d1496..8f6c290 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -14,8 +13,9 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "views/controls/label.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" +#include "views/controls/label.h" // Amount of space to offset the tab image from the top of the view by. static const int kTabImageYOffset = 4; diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 1e8943c..fae9b01 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -9,7 +9,6 @@ #endif #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" @@ -43,6 +42,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/controls/label.h" #include "views/drag_utils.h" diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index 2d281e6..ba9c882 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/location_bar/star_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" @@ -13,6 +12,7 @@ #include "chrome/browser/ui/views/browser_dialogs.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" StarView::StarView(CommandUpdater* command_updater) : command_updater_(command_updater) { diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index 92bfd9e..dfefc7f 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -7,7 +7,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" @@ -29,6 +28,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" #include "views/controls/button/text_button.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index 87591b1..c0b2cb2 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -15,7 +15,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/rtl.h" @@ -59,6 +58,7 @@ #include "net/base/ssl_config_service_win.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/checkbox.h" #include "views/controls/combobox/combobox.h" diff --git a/chrome/browser/ui/views/options/exception_editor_view.cc b/chrome/browser/ui/views/options/exception_editor_view.cc index 2f756bf..9b32d54 100644 --- a/chrome/browser/ui/views/options/exception_editor_view.cc +++ b/chrome/browser/ui/views/options/exception_editor_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/options/exception_editor_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" #include "googleurl/src/url_canon.h" @@ -13,6 +12,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/grid_layout.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/options/fonts_page_view.cc b/chrome/browser/ui/views/options/fonts_page_view.cc index df6867c..f1e1463 100644 --- a/chrome/browser/ui/views/options/fonts_page_view.cc +++ b/chrome/browser/ui/views/options/fonts_page_view.cc @@ -12,7 +12,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -28,6 +27,7 @@ #include "grit/theme_resources.h" #include "grit/locale_settings.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/options/languages_page_view.cc b/chrome/browser/ui/views/options/languages_page_view.cc index e9594ac..bcfa114 100644 --- a/chrome/browser/ui/views/options/languages_page_view.cc +++ b/chrome/browser/ui/views/options/languages_page_view.cc @@ -10,7 +10,6 @@ #include "chrome/browser/ui/views/options/languages_page_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/string_util.h" @@ -32,6 +31,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/resource/resource_bundle.h" #include "unicode/uloc.h" #include "views/controls/button/radio_button.h" #include "views/controls/tabbed_pane/tabbed_pane.h" diff --git a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc index bda176d..2cc086c 100644 --- a/chrome/browser/ui/views/options/managed_prefs_banner_view.cc +++ b/chrome/browser/ui/views/options/managed_prefs_banner_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" -#include "app/resource_bundle.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/box_layout.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/options/options_group_view.cc b/chrome/browser/ui/views/options/options_group_view.cc index ef3583f..dcdfd29 100644 --- a/chrome/browser/ui/views/options/options_group_view.cc +++ b/chrome/browser/ui/views/options/options_group_view.cc @@ -8,7 +8,6 @@ #include "chrome/browser/ui/views/options/options_group_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" @@ -16,6 +15,7 @@ #include "gfx/native_theme_win.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/separator.h" diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index f0f4639..02affe9 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/sad_tab_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -19,6 +18,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/resource/resource_bundle.h" static const int kSadTabOffset = -64; static const int kIconTitleSpacing = 20; diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 027c0a3..7ae317e 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/string_util.h" @@ -23,6 +22,7 @@ #include "third_party/skia/include/core/SkRect.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/linear_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/controls/label.h" #include "views/controls/scrollbar/native_scroll_bar.h" diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc index 4c44a8f..21a1da1 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/status_icons/status_icon_win.h" @@ -12,6 +11,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/base/resource/resource_bundle.h" class SkBitmap; diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 7fb1560..7a39737 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc @@ -9,7 +9,6 @@ #include <shellapi.h> #endif -#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" #include "chrome/app/chrome_command_ids.h" @@ -17,6 +16,7 @@ #include "gfx/favicon_size.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index ae745c5..f36273f 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -7,7 +7,6 @@ #include <limits> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -21,6 +20,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc index 35ea20d..706b85d 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc @@ -7,7 +7,6 @@ #include <math.h> #include <set> -#include "app/resource_bundle.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "chrome/browser/browser_window.h" @@ -33,6 +32,7 @@ #include "ui/base/animation/animation.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/event.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/tabs/side_tab.cc b/chrome/browser/ui/views/tabs/side_tab.cc index 78b0c5a..dbed8df 100644 --- a/chrome/browser/ui/views/tabs/side_tab.cc +++ b/chrome/browser/ui/views/tabs/side_tab.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/tabs/side_tab.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" @@ -12,6 +11,7 @@ #include "gfx/skia_util.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" namespace { diff --git a/chrome/browser/ui/views/tabs/side_tab_strip.cc b/chrome/browser/ui/views/tabs/side_tab_strip.cc index 0df8ce2..dfc3cf0 100644 --- a/chrome/browser/ui/views/tabs/side_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/side_tab_strip.cc @@ -5,13 +5,13 @@ #include "chrome/browser/ui/views/tabs/side_tab_strip.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/tabs/side_tab.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index b751330..b65df36 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -6,7 +6,6 @@ #include <limits> -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/themes/browser_theme_provider.h" @@ -22,6 +21,7 @@ #include "ui/base/animation/multi_animation.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/widget/tooltip_manager.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 9c7ca46..906d360 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/compiler_specific.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/animation_container.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/widget/default_theme_provider.h" #include "views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc index 857731f..879156e 100644 --- a/chrome/browser/ui/views/theme_background.cc +++ b/chrome/browser/ui/views/theme_background.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/theme_background.h" -#include "app/resource_bundle.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/views/frame/browser_view.h" @@ -12,6 +11,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/view.h" ThemeBackground::ThemeBackground(BrowserView* browser_view) diff --git a/chrome/browser/ui/views/theme_install_bubble_view.cc b/chrome/browser/ui/views/theme_install_bubble_view.cc index 8b7b30a..c86877f 100644 --- a/chrome/browser/ui/views/theme_install_bubble_view.cc +++ b/chrome/browser/ui/views/theme_install_bubble_view.cc @@ -5,12 +5,12 @@ #include "chrome/browser/ui/views/theme_install_bubble_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/widget/widget.h" namespace { diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 8e82fc4..9ff2d8f 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/toolbar_view.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/i18n/number_formatting.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -31,6 +30,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button_dropdown.h" #include "views/focus/view_storage.h" #include "views/widget/tooltip_manager.h" diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index fe6354d..dbbd816 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/views/url_picker.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -20,6 +19,7 @@ #include "net/base/net_util.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/table_model.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 896ec8a..6898fcd 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -7,7 +7,6 @@ #include <cmath> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" #include "views/controls/button/menu_button.h" |