diff options
126 files changed, 129 insertions, 129 deletions
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS index eb70713..2ee68db 100644 --- a/android_webview/browser/DEPS +++ b/android_webview/browser/DEPS @@ -31,7 +31,7 @@ include_rules = [ # Temporary until we bundle our own favicon. See # AwContentBrowserClient::GetDefaultFavicon - "!grit/ui_resources.h", + "!ui/resources/grit/ui_resources.h", # POD structure required by the find-in-page IPC messages. "+third_party/WebKit/public/web/WebFindOptions.h", diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 4f44dd3..14c6c312 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -29,12 +29,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" #include "content/public/common/web_preferences.h" -#include "grit/ui_resources.h" #include "net/android/network_library.h" #include "net/ssl/ssl_cert_request_info.h" #include "net/ssl/ssl_info.h" #include "ui/base/l10n/l10n_util_android.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" using content::BrowserThread; using content::ResourceType; @@ -6,7 +6,6 @@ include_rules = [ "+gpu/config", "+grit/ash_resources.h", "+grit/ash_strings.h", - "+grit/ui_resources.h", "+grit/ui_strings.h", "+media", "+skia/ext", diff --git a/ash/drag_drop/drag_image_view.cc b/ash/drag_drop/drag_image_view.cc index 746d619..2148209 100644 --- a/ash/drag_drop/drag_image_view.cc +++ b/ash/drag_drop/drag_image_view.cc @@ -4,13 +4,13 @@ #include "ash/drag_drop/drag_image_view.h" -#include "grit/ui_resources.h" #include "skia/ext/image_operations.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/dip_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/size_conversions.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/shadow_types.h" diff --git a/ash/system/tray/hover_highlight_view.cc b/ash/system/tray/hover_highlight_view.cc index e87708c..be2efc2 100644 --- a/ash/system/tray/hover_highlight_view.cc +++ b/ash/system/tray/hover_highlight_view.cc @@ -7,11 +7,11 @@ #include "ash/system/tray/fixed_sized_image_view.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/view_click_listener.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font_list.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" diff --git a/ash/system/tray/tray_bar_button_with_title.cc b/ash/system/tray/tray_bar_button_with_title.cc index a020135..e8b8f53 100644 --- a/ash/system/tray/tray_bar_button_with_title.cc +++ b/ash/system/tray/tray_bar_button_with_title.cc @@ -6,9 +6,9 @@ #include "ash/system/tray/tray_constants.h" #include "base/memory/scoped_ptr.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/label.h" #include "ui/views/painter.h" diff --git a/ash/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc index a728c60..bf977f5 100644 --- a/ash/system/tray/tray_notification_view.cc +++ b/ash/system/tray/tray_notification_view.cc @@ -7,9 +7,9 @@ #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/tray_constants.h" #include "grit/ash_strings.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" diff --git a/ash/system/user/accounts_detailed_view.cc b/ash/system/user/accounts_detailed_view.cc index d253414..8e64a6a 100644 --- a/ash/system/user/accounts_detailed_view.cc +++ b/ash/system/user/accounts_detailed_view.cc @@ -19,9 +19,9 @@ #include "base/strings/utf_string_conversions.h" #include "components/user_manager/user_info.h" #include "grit/ash_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/layout/box_layout.h" #include "ui/views/layout/grid_layout.h" diff --git a/ash/wm/ash_native_cursor_manager_unittest.cc b/ash/wm/ash_native_cursor_manager_unittest.cc index ba7de8a..01def5e 100644 --- a/ash/wm/ash_native_cursor_manager_unittest.cc +++ b/ash/wm/ash_native_cursor_manager_unittest.cc @@ -23,8 +23,8 @@ #endif #if defined(USE_X11) -#include "grit/ui_resources.h" #include "ui/base/cursor/cursor_loader_x11.h" +#include "ui/resources/grit/ui_resources.h" #endif namespace ash { diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index 6c9fb3f..c2e91d7 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc @@ -20,13 +20,13 @@ #include "content/public/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/canonical_cookie.h" #include "net/url_request/url_request_context.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" #if defined(ENABLE_EXTENSIONS) #include "chrome/browser/extensions/extension_special_storage_policy.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index d81d481..2b22962 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -127,7 +127,6 @@ #include "extensions/common/permissions/socket_permission.h" #include "extensions/common/switches.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "net/base/mime_util.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_options.h" @@ -136,6 +135,7 @@ #include "ppapi/shared_impl/ppapi_switches.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "webkit/browser/fileapi/external_mount_points.h" #if defined(OS_WIN) diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index d93ba47..9335fe4 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -20,11 +20,11 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" #include "ui/gfx/codec/png_codec.h" +#include "ui/resources/grit/ui_resources.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc index ddf8d4f..78934f4 100644 --- a/chrome/browser/extensions/extension_action.cc +++ b/chrome/browser/extensions/extension_action.cc @@ -13,7 +13,6 @@ #include "chrome/common/icon_with_badge_image_source.h" #include "extensions/common/constants.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" @@ -28,6 +27,7 @@ #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" +#include "ui/resources/grit/ui_resources.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index ff4bb0b..ebb011f 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -15,12 +15,12 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/image_button.h" diff --git a/chrome/browser/resources_util_unittest.cc b/chrome/browser/resources_util_unittest.cc index ec52eef..e5d6733 100644 --- a/chrome/browser/resources_util_unittest.cc +++ b/chrome/browser/resources_util_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/resources_util.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/resources/grit/ui_resources.h" #if defined(OS_CHROMEOS) #include "grit/ui_chromeos_resources.h" diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index 2029b51..4fd5cc53 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -22,12 +22,12 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/jstemplate_builder.h" #include "ui/base/webui/web_ui_util.h" +#include "ui/resources/grit/ui_resources.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 00e58ab..fc71459 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -41,12 +41,12 @@ #include "content/public/common/result_codes.h" #include "extensions/browser/extension_system.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" #if defined(OS_MACOSX) #include "content/public/browser/browser_child_process_host.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 5dcb8ff..d67b152 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -21,7 +21,6 @@ #include "content/public/browser/browser_thread.h" #include "extensions/common/id_util.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkCanvas.h" #include "ui/base/resource/data_pack.h" #include "ui/base/resource/resource_bundle.h" @@ -34,6 +33,7 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size_conversions.h" #include "ui/gfx/skia_util.h" +#include "ui/resources/grit/ui_resources.h" using content::BrowserThread; using extensions::Extension; diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc index 1807822..caafb1c 100644 --- a/chrome/browser/themes/theme_properties.cc +++ b/chrome/browser/themes/theme_properties.cc @@ -9,7 +9,7 @@ #include "base/strings/string_util.h" #include "chrome/browser/themes/browser_theme_pack.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index bc77a17..7b627e5 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -30,10 +30,10 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" #if defined(OS_WIN) #include "ui/base/win/shell.h" diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc index 0e5a655..877bbac 100644 --- a/chrome/browser/ui/android/navigation_popup.cc +++ b/chrome/browser/ui/android/navigation_popup.cc @@ -14,12 +14,12 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/url_constants.h" -#include "grit/ui_resources.h" #include "jni/NavigationPopup_jni.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/android/java_bitmap.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" #include "url/gurl.h" using base::android::ConvertUTF8ToJavaString; diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index 05b62d0..8ab6020 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -80,12 +80,12 @@ #include "grit/ash_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "net/base/url_util.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/base/l10n/l10n_util.h" #include "ui/keyboard/keyboard_util.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/wm/core/window_animations.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/chrome_style.cc b/chrome/browser/ui/chrome_style.cc index e9a6637..1165012 100644 --- a/chrome/browser/ui/chrome_style.cc +++ b/chrome/browser/ui/chrome_style.cc @@ -5,9 +5,9 @@ #include "chrome/browser/ui/chrome_style.h" #include "chrome/browser/themes/theme_properties.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" namespace chrome_style { diff --git a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm index 3b024e7..b5186f3 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser.mm @@ -10,11 +10,11 @@ #include "chrome/browser/ui/cocoa/autofill/autofill_dialog_constants.h" #import "chrome/browser/ui/cocoa/autofill/down_arrow_popup_menu_cell.h" #import "chrome/browser/ui/cocoa/menu_button.h" -#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #import "ui/base/cocoa/controls/hyperlink_button_cell.h" #include "ui/base/models/menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #pragma mark Helper functions diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 61a3b29..9c745b4 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -58,11 +58,11 @@ #include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #import "ui/base/cocoa/cocoa_base_utils.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" using base::UserMetricsAction; using bookmarks::BookmarkNodeData; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm index 7418039..ac03561 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm @@ -5,8 +5,8 @@ #include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm index 376e7d0..21e0882 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm @@ -11,9 +11,9 @@ #import "components/bookmarks/browser/bookmark_model.h" #include "content/public/browser/user_metrics.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" using base::UserMetricsAction; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm index 9e44e47..c4c4a0f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell_unittest.mm @@ -10,11 +10,11 @@ #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/test/base/testing_profile.h" #include "components/bookmarks/browser/bookmark_model.h" -#include "grit/ui_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" // Simple class to remember how many mouseEntered: and mouseExited: // calls it gets. Only used by BookmarkMouseForwarding but placed diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm index 1886cd2..0983491 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm @@ -19,10 +19,10 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" -#include "grit/ui_resources.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +#include "ui/resources/grit/ui_resources.h" using bookmarks::BookmarkNodeData; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 075374d..436728a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -19,10 +19,10 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu) : menuIsValid_(false), diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm index 20a9635..08586cc 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller.mm @@ -13,11 +13,11 @@ #include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm index 6ac9b95..ac9504c 100644 --- a/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm @@ -11,13 +11,13 @@ #include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" @interface FakeEditSearchEngineController : EditSearchEngineCocoaController diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm index 64133de..cabe1be 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.mm @@ -8,8 +8,6 @@ #include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" -#include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -24,9 +22,11 @@ #include "chrome/browser/ui/find_bar/find_tab_helper.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "grit/theme_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "ui/base/cocoa/find_pasteboard.h" #import "ui/base/cocoa/focus_tracker.h" +#include "ui/resources/grit/ui_resources.h" using content::NativeWebKeyboardEvent; diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 25bc67e..e4785f3 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -20,11 +20,11 @@ #include "content/public/browser/notification_source.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/gfx/text_elider.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm index fa99676..454dfbd 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.mm +++ b/chrome/browser/ui/cocoa/hover_close_button.mm @@ -6,11 +6,11 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h" #include "ui/base/cocoa/animation_utils.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" namespace { const CGFloat kFramesPerSecond = 16; // Determined experimentally to look good. diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 871aad1..c2676a2 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -21,12 +21,12 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" using content::WebContents; diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm index 80cc4a2..b22de79 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_controller.mm @@ -18,8 +18,8 @@ #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" @interface InfoBarController () // Sets |label_| based on |labelPlaceholder_|, sets |labelPlaceholder_| to nil. diff --git a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm index 816e608..f6cd646 100644 --- a/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm +++ b/chrome/browser/ui/cocoa/panels/panel_window_controller_cocoa.mm @@ -21,9 +21,9 @@ #import "chrome/browser/ui/cocoa/panels/panel_cocoa.h" #import "chrome/browser/ui/cocoa/panels/panel_titlebar_view_cocoa.h" #import "chrome/browser/ui/cocoa/panels/panel_utils_cocoa.h" +#import "chrome/browser/ui/cocoa/sprite_view.h" #import "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h" -#import "chrome/browser/ui/cocoa/sprite_view.h" #include "chrome/browser/ui/panels/panel_bounds_animation.h" #include "chrome/browser/ui/panels/panel_collection.h" #include "chrome/browser/ui/panels/panel_constants.h" @@ -33,9 +33,9 @@ #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" using content::WebContents; diff --git a/chrome/browser/ui/cocoa/sprite_view_unittest.mm b/chrome/browser/ui/cocoa/sprite_view_unittest.mm index 0ace580..be68f19 100644 --- a/chrome/browser/ui/cocoa/sprite_view_unittest.mm +++ b/chrome/browser/ui/cocoa/sprite_view_unittest.mm @@ -7,11 +7,11 @@ #include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/sprite_view.h" -#include "grit/ui_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm index 16fd648..b4fe508 100644 --- a/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm +++ b/chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.mm @@ -5,8 +5,8 @@ #include "chrome/browser/ui/cocoa/tab_contents/favicon_util_mac.h" #include "chrome/browser/favicon/favicon_tab_helper.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" namespace mac { diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm index 59776db..dfb000c 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller_unittest.mm @@ -13,11 +13,11 @@ #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_view.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" // Implements the target interface for the tab, which gets sent messages when // the tab is clicked on by the user and when its close box is clicked. diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index e8a76a1..45e3a13 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -58,7 +58,6 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #include "ui/base/cocoa/animation_utils.h" @@ -69,6 +68,7 @@ #include "ui/base/theme_provider.h" #include "ui/gfx/image/image.h" #include "ui/gfx/mac/scoped_ns_disable_screen_updates.h" +#include "ui/resources/grit/ui_resources.h" using base::UserMetricsAction; using content::OpenURLParams; diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm index 415057b..2b0ccfd 100644 --- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm @@ -31,13 +31,13 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/controls/hyperlink_button_cell.h" #import "ui/base/cocoa/flipped_view.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index 6ad1476..0c2c8ef 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc @@ -35,10 +35,10 @@ #include "content/public/browser/web_contents_delegate.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" using base::UserMetricsAction; using content::WebContents; diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc index 89e7eef..6501f18 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc @@ -34,7 +34,6 @@ #include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h" #include "grit/component_scaled_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "printing/printing_context_linux.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" @@ -48,6 +47,7 @@ #include "ui/gfx/size.h" #include "ui/gfx/skbitmap_operations.h" #include "ui/gfx/skia_util.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/button/label_button_border.h" #include "ui/views/linux_ui/window_button_order_observer.h" diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index e71f3ce..f9c29c2 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -12,11 +12,11 @@ #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" // Group IDs used by TemplateURLTableModel. static const int kMainGroupID = 0; diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc index 761b65a..9ac637c 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -30,10 +30,10 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #if defined(USE_ASH) #include "ash/accelerators/accelerator_table.h" diff --git a/chrome/browser/ui/views/app_list/app_list_dialog_contents_view.cc b/chrome/browser/ui/views/app_list/app_list_dialog_contents_view.cc index 423eca9..4693f8a 100644 --- a/chrome/browser/ui/views/app_list/app_list_dialog_contents_view.cc +++ b/chrome/browser/ui/views/app_list/app_list_dialog_contents_view.cc @@ -7,7 +7,6 @@ #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/app_list_service.h" #include "chrome/browser/ui/host_desktop.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/app_list/app_list_constants.h" #include "ui/base/accelerators/accelerator.h" @@ -16,6 +15,7 @@ #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/border.h" #include "ui/views/controls/button/label_button.h" diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc index bc344b3..4ed881f 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc @@ -26,7 +26,6 @@ #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/models/combobox_model.h" #include "ui/base/models/menu_model.h" @@ -39,6 +38,7 @@ #include "ui/gfx/path.h" #include "ui/gfx/point.h" #include "ui/gfx/skia_util.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/border.h" #include "ui/views/bubble/bubble_border.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 7292a6e..7e5270b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -64,7 +64,6 @@ #include "extensions/common/extension_set.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" @@ -76,6 +75,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/text_constants.h" #include "ui/gfx/text_elider.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/button_drag_utils.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/button/label_button_border.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 6c5df78..bc03d1d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -21,10 +21,10 @@ #include "content/public/browser/page_navigator.h" #include "content/public/browser/user_metrics.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/window_open_disposition.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/submenu_view.h" diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index aa24d10..7d5b49a 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc @@ -22,12 +22,12 @@ #include "content/public/browser/page_navigator.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 1dd6700..c80d388 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -14,10 +14,10 @@ #include "components/search_engines/template_url.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc index a2c2aba..c1ade61 100644 --- a/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/bundle_installed_bubble.cc @@ -10,9 +10,9 @@ #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc index a20c797..1dd5f00 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc @@ -33,11 +33,11 @@ #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/render_text.h" #include "ui/gfx/text_elider.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" #include "ui/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 830b85a..462fc6b 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -21,13 +21,13 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/events/event.h" #include "ui/gfx/canvas.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 6ac858d..0253aa6 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -113,7 +113,6 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "grit/webkit_resources.h" #include "ui/accessibility/ax_view_state.h" @@ -130,6 +129,7 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/screen.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/webview/webview.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 c7f245f..116a7b9 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -22,13 +22,13 @@ #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/notification_service.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle_win.h" #include "ui/base/theme_provider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/icon_util.h" #include "ui/gfx/image/image.h" #include "ui/gfx/win/dpi.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/label.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/win/hwnd_util.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 63ae7c6..03023d3 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -31,7 +31,6 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" @@ -43,6 +42,7 @@ #include "ui/gfx/image/image_skia.h" #include "ui/gfx/path.h" #include "ui/gfx/rect_conversions.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc index 313c1fe..f8f8a38 100644 --- a/chrome/browser/ui/views/infobars/infobar_view.cc +++ b/chrome/browser/ui/views/infobars/infobar_view.cc @@ -12,13 +12,13 @@ #include "components/infobars/core/infobar_delegate.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/button/label_button_border.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc index bb62b8c..50fad6c 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc @@ -11,11 +11,11 @@ #include "chrome/browser/ui/omnibox/omnibox_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" -#include "grit/ui_resources.h" #include "ui/base/theme_provider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/gfx/path.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/image_view.h" #include "ui/views/view_targeter.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/panels/panel_frame_view.cc b/chrome/browser/ui/views/panels/panel_frame_view.cc index 1f4229e..7e56e98 100644 --- a/chrome/browser/ui/views/panels/panel_frame_view.cc +++ b/chrome/browser/ui/views/panels/panel_frame_view.cc @@ -11,7 +11,6 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" @@ -20,6 +19,7 @@ #include "ui/gfx/font_list.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/ui/views/passwords/manage_password_item_view.cc b/chrome/browser/ui/views/passwords/manage_password_item_view.cc index 7b914d6..c67f904 100644 --- a/chrome/browser/ui/views/passwords/manage_password_item_view.cc +++ b/chrome/browser/ui/views/passwords/manage_password_item_view.cc @@ -7,9 +7,9 @@ #include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" #include "components/password_manager/core/common/password_manager_ui.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/layout/fill_layout.h" diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc index 763ce8a..e95128f 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -34,8 +34,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/label_button.h" diff --git a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc index 622ba31..dae0f30 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc +++ b/chrome/browser/ui/views/sync/one_click_signin_bubble_view.cc @@ -14,10 +14,10 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/keycodes/keyboard_codes.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/image_view.h" diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 76864f3..400c7e4 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc @@ -14,11 +14,11 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/views/tab_icon_view_model.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/gfx/canvas.h" #include "ui/gfx/favicon_size.h" +#include "ui/resources/grit/ui_resources.h" #if defined(OS_WIN) #include "chrome/browser/app_icon_win.h" diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index be43953..9ee20bd 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -22,7 +22,6 @@ #include "chrome/common/chrome_switches.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/accessibility/ax_view_state.h" #include "ui/aura/env.h" @@ -40,6 +39,7 @@ #include "ui/gfx/path.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/skia_util.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc index 828b916..491d85c 100644 --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc @@ -26,7 +26,6 @@ #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/dragdrop/drag_utils.h" @@ -37,6 +36,7 @@ #include "ui/gfx/animation/slide_animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/label_button_border.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/resize_area.h" diff --git a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc index fb6b22f..2e0e7acf 100644 --- a/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc +++ b/chrome/browser/ui/views/website_settings/permissions_bubble_view.cc @@ -9,13 +9,13 @@ #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" #include "grit/generated_resources.h" -#include "grit/ui_resources.h" #include "net/base/net_util.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/text_constants.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/label_button.h" diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index 361bceb..12cd3db 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -26,7 +26,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" @@ -34,6 +33,7 @@ #include "ui/gfx/font_list.h" #include "ui/gfx/image/image.h" #include "ui/gfx/insets.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/button/menu_button_listener.h" diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc index b9ca5eb..601fa0e 100644 --- a/chrome/browser/ui/website_settings/website_settings_ui.cc +++ b/chrome/browser/ui/website_settings/website_settings_ui.cc @@ -6,10 +6,10 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index fa06874..faa6cdf 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -19,12 +19,12 @@ #include "chrome/common/favicon/favicon_url_parser.h" #include "chrome/common/url_constants.h" #include "grit/locale_settings.h" -#include "grit/ui_resources.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/web_ui_util.h" +#include "ui/resources/grit/ui_resources.h" FaviconSource::IconRequest::IconRequest() : size_in_dip(gfx::kFaviconSize), device_scale_factor(1.0f) { diff --git a/chrome/common/badge_util.cc b/chrome/common/badge_util.cc index adf8154..5bae4d5 100644 --- a/chrome/common/badge_util.cc +++ b/chrome/common/badge_util.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkTypeface.h" #include "ui/base/resource/resource_bundle.h" @@ -16,6 +15,7 @@ #include "ui/gfx/font.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/content/DEPS b/content/DEPS index d964f5d..bce04c1 100644 --- a/content/DEPS +++ b/content/DEPS @@ -27,7 +27,6 @@ include_rules = [ "+grit/blink_resources.h", "+grit/content_resources.h", "+grit/content_strings.h", - "+grit/ui_resources.h", "+grit/ui_strings.h", "+grit/webkit_resources.h", "+grit/webui_resources.h", @@ -90,6 +89,7 @@ include_rules = [ "+ui/native_theme", "+ui/ozone/gpu", "+ui/ozone/public", + "+ui/resources/grit/ui_resources.h", "+ui/shell_dialogs", "+ui/snapshot", "+ui/surface", diff --git a/content/browser/web_contents/aura/gesture_nav_simple.cc b/content/browser/web_contents/aura/gesture_nav_simple.cc index f904fe2..2a41ffb 100644 --- a/content/browser/web_contents/aura/gesture_nav_simple.cc +++ b/content/browser/web_contents/aura/gesture_nav_simple.cc @@ -12,7 +12,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/overscroll_configuration.h" #include "content/public/common/content_client.h" -#include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_observer.h" @@ -21,6 +20,7 @@ #include "ui/gfx/animation/tween.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" namespace content { diff --git a/content/browser/web_contents/web_drag_source_mac.mm b/content/browser/web_contents/web_drag_source_mac.mm index b0f2160..f8b639c 100644 --- a/content/browser/web_contents/web_drag_source_mac.mm +++ b/content/browser/web_contents/web_drag_source_mac.mm @@ -24,13 +24,13 @@ #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" #include "content/public/common/drop_data.h" -#include "grit/ui_resources.h" #include "net/base/escape.h" #include "net/base/filename_util.h" #include "net/base/mime_util.h" #include "ui/base/clipboard/custom_data_helper.h" #include "ui/base/dragdrop/cocoa_dnd_util.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" #include "url/url_constants.h" using base::SysNSStringToUTF8; diff --git a/ui/app_list/DEPS b/ui/app_list/DEPS index 5d04ab1..9e511f2 100644 --- a/ui/app_list/DEPS +++ b/ui/app_list/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+grit/ui_resources.h", "+grit/ui_strings.h", "+skia", "+sync", @@ -11,5 +10,6 @@ include_rules = [ "+ui/compositor", "+ui/events", "+ui/gfx", + "+ui/resources/grit/ui_resources.h", "+ui/views", ] diff --git a/ui/app_list/app_list_menu.cc b/ui/app_list/app_list_menu.cc index 7114b06..e322a40 100644 --- a/ui/app_list/app_list_menu.cc +++ b/ui/app_list/app_list_menu.cc @@ -4,12 +4,12 @@ #include "ui/app_list/app_list_menu.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/app_list/app_list_view_delegate.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_separator_types.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" namespace app_list { diff --git a/ui/app_list/cocoa/apps_search_box_controller.mm b/ui/app_list/cocoa/apps_search_box_controller.mm index 9396282..0e5ba2f 100644 --- a/ui/app_list/cocoa/apps_search_box_controller.mm +++ b/ui/app_list/cocoa/apps_search_box_controller.mm @@ -7,7 +7,6 @@ #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" -#include "grit/ui_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSBezierPath+RoundRect.h" #include "ui/app_list/app_list_menu.h" #include "ui/app_list/app_list_model.h" @@ -18,6 +17,7 @@ #import "ui/base/cocoa/menu_controller.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia_util_mac.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/ui/app_list/demo/app_list_demo_views.cc b/ui/app_list/demo/app_list_demo_views.cc index ec1ce50..29c165f 100644 --- a/ui/app_list/demo/app_list_demo_views.cc +++ b/ui/app_list/demo/app_list_demo_views.cc @@ -8,11 +8,11 @@ #include "base/run_loop.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" -#include "grit/ui_resources.h" #include "ui/app_list/test/app_list_test_model.h" #include "ui/app_list/test/app_list_test_view_delegate.h" #include "ui/app_list/views/app_list_view.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/webview/webview.h" #include "ui/views_content_client/views_content_client.h" diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc index 9bbfecb..5f16ae0 100644 --- a/ui/app_list/views/app_list_view.cc +++ b/ui/app_list/views/app_list_view.cc @@ -9,7 +9,6 @@ #include "base/command_line.h" #include "base/strings/string_util.h" #include "base/win/windows_version.h" -#include "grit/ui_resources.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/app_list_model.h" #include "ui/app_list/app_list_switches.h" @@ -33,6 +32,7 @@ #include "ui/gfx/insets.h" #include "ui/gfx/path.h" #include "ui/gfx/skia_util.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc index a2418e0..997c6c3 100644 --- a/ui/app_list/views/contents_view.cc +++ b/ui/app_list/views/contents_view.cc @@ -8,7 +8,6 @@ #include <vector> #include "base/logging.h" -#include "grit/ui_resources.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/app_list_switches.h" #include "ui/app_list/app_list_view_delegate.h" @@ -20,6 +19,7 @@ #include "ui/app_list/views/search_result_list_view.h" #include "ui/app_list/views/start_page_view.h" #include "ui/events/event.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/view_model.h" #include "ui/views/view_model_utils.h" diff --git a/ui/app_list/views/folder_header_view.cc b/ui/app_list/views/folder_header_view.cc index 19ef48d..106b7b1 100644 --- a/ui/app_list/views/folder_header_view.cc +++ b/ui/app_list/views/folder_header_view.cc @@ -7,13 +7,13 @@ #include <algorithm> #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/app_list/app_list_constants.h" #include "ui/app_list/app_list_folder_item.h" #include "ui/app_list/views/app_list_folder_view.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/app_list/views/progress_bar_view.cc b/ui/app_list/views/progress_bar_view.cc index f80c4f7..5a7094b 100644 --- a/ui/app_list/views/progress_bar_view.cc +++ b/ui/app_list/views/progress_bar_view.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/insets.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/painter.h" namespace app_list { diff --git a/ui/app_list/views/search_box_view.cc b/ui/app_list/views/search_box_view.cc index b538b36..7f0c4be 100644 --- a/ui/app_list/views/search_box_view.cc +++ b/ui/app_list/views/search_box_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "grit/ui_resources.h" #include "ui/app_list/app_list_model.h" #include "ui/app_list/app_list_view_delegate.h" #include "ui/app_list/search_box_model.h" @@ -15,6 +14,7 @@ #include "ui/app_list/views/search_box_view_delegate.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" diff --git a/ui/app_list/views/speech_view.cc b/ui/app_list/views/speech_view.cc index dee5991..12d5c09 100644 --- a/ui/app_list/views/speech_view.cc +++ b/ui/app_list/views/speech_view.cc @@ -5,7 +5,6 @@ #include "ui/app_list/views/speech_view.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "third_party/skia/include/core/SkPath.h" #include "ui/app_list/app_list_model.h" @@ -15,6 +14,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/path.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" diff --git a/ui/base/DEPS b/ui/base/DEPS index dd9bbe8..38bd908 100644 --- a/ui/base/DEPS +++ b/ui/base/DEPS @@ -1,7 +1,6 @@ include_rules = [ "+cc", "+grit/app_locale_settings.h", - "+grit/ui_resources.h", "+grit/ui_strings.h", "+grit/ui_unscaled_resources.h", "+grit/webui_resources.h", @@ -11,4 +10,5 @@ include_rules = [ "+third_party/skia", "+ui/events", "+ui/gfx", + "+ui/resources/grit/ui_resources.h", ] diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm index 43520dd..6ba10bd 100644 --- a/ui/base/cocoa/menu_controller_unittest.mm +++ b/ui/base/cocoa/menu_controller_unittest.mm @@ -7,7 +7,6 @@ #include "base/message_loop/message_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "third_party/skia/include/core/SkBitmap.h" #import "ui/base/cocoa/menu_controller.h" @@ -15,6 +14,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #import "ui/gfx/test/ui_cocoa_test_helper.h" +#include "ui/resources/grit/ui_resources.h" using base::ASCIIToUTF16; diff --git a/ui/base/cursor/cursors_aura.cc b/ui/base/cursor/cursors_aura.cc index 54546f4..e244b19 100644 --- a/ui/base/cursor/cursors_aura.cc +++ b/ui/base/cursor/cursors_aura.cc @@ -4,11 +4,11 @@ #include "ui/base/cursor/cursors_aura.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/point.h" +#include "ui/resources/grit/ui_resources.h" namespace ui { namespace { diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc index 9fdfd36..7e7567b 100644 --- a/ui/base/resource/resource_bundle_unittest.cc +++ b/ui/base/resource/resource_bundle_unittest.cc @@ -13,7 +13,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -21,6 +20,8 @@ #include "ui/base/resource/data_pack.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" + #if defined(OS_WIN) #include "ui/gfx/win/dpi.h" #endif diff --git a/ui/message_center/DEPS b/ui/message_center/DEPS index b20b0ae..b1d1ddc 100644 --- a/ui/message_center/DEPS +++ b/ui/message_center/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+grit/ui_resources.h", "+grit/ui_strings.h", "+skia/ext", "+third_party/skia", @@ -10,6 +9,7 @@ include_rules = [ "+ui/events", "+ui/gfx", "+ui/native_theme", + "+ui/resources/grit/ui_resources.h", "+ui/test", "+ui/views", ] diff --git a/ui/message_center/cocoa/notification_controller.mm b/ui/message_center/cocoa/notification_controller.mm index d492d9b..c1ce021 100644 --- a/ui/message_center/cocoa/notification_controller.mm +++ b/ui/message_center/cocoa/notification_controller.mm @@ -10,7 +10,6 @@ #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "skia/ext/skia_utils_mac.h" #import "ui/base/cocoa/hover_image_button.h" @@ -22,6 +21,7 @@ #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/notification.h" +#include "ui/resources/grit/ui_resources.h" @interface MCNotificationProgressBar : NSProgressIndicator diff --git a/ui/message_center/cocoa/settings_entry_view.mm b/ui/message_center/cocoa/settings_entry_view.mm index ab73d98..c31d230 100644 --- a/ui/message_center/cocoa/settings_entry_view.mm +++ b/ui/message_center/cocoa/settings_entry_view.mm @@ -7,11 +7,11 @@ #include <algorithm> #include "base/strings/sys_string_conversions.h" -#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #include "ui/base/resource/resource_bundle.h" #import "ui/message_center/cocoa/settings_controller.h" #include "ui/message_center/message_center_style.h" +#include "ui/resources/grit/ui_resources.h" using message_center::settings::kEntryIconSize; using message_center::settings::kInternalHorizontalSpacing; diff --git a/ui/message_center/cocoa/status_item_view.mm b/ui/message_center/cocoa/status_item_view.mm index cf93bdd..166de9f 100644 --- a/ui/message_center/cocoa/status_item_view.mm +++ b/ui/message_center/cocoa/status_item_view.mm @@ -7,8 +7,8 @@ #include <cmath> #include "base/format_macros.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" // The width of the status bar item when it's just the icon. const CGFloat kStatusItemLength = 26; diff --git a/ui/message_center/cocoa/tray_view_controller.mm b/ui/message_center/cocoa/tray_view_controller.mm index 93bac88..df9e4c8 100644 --- a/ui/message_center/cocoa/tray_view_controller.mm +++ b/ui/message_center/cocoa/tray_view_controller.mm @@ -8,7 +8,6 @@ #include "base/mac/scoped_nsautorelease_pool.h" #include "base/time/time.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "skia/ext/skia_utils_mac.h" #import "ui/base/cocoa/hover_image_button.h" @@ -20,6 +19,7 @@ #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/notifier_settings.h" +#include "ui/resources/grit/ui_resources.h" const int kBackButtonSize = 16; diff --git a/ui/message_center/views/message_center_button_bar.cc b/ui/message_center/views/message_center_button_bar.cc index 42d7523..a5a648c 100644 --- a/ui/message_center/views/message_center_button_bar.cc +++ b/ui/message_center/views/message_center_button_bar.cc @@ -4,7 +4,6 @@ #include "ui/message_center/views/message_center_button_bar.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" @@ -15,6 +14,7 @@ #include "ui/message_center/message_center_tray.h" #include "ui/message_center/notifier_settings.h" #include "ui/message_center/views/message_center_view.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/label_button.h" diff --git a/ui/message_center/views/message_center_view.cc b/ui/message_center/views/message_center_view.cc index 6a7e815..7906c84 100644 --- a/ui/message_center/views/message_center_view.cc +++ b/ui/message_center/views/message_center_view.cc @@ -10,7 +10,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/stl_util.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/animation/multi_animation.h" @@ -28,6 +27,7 @@ #include "ui/message_center/views/message_view_context_menu_controller.h" #include "ui/message_center/views/notification_view.h" #include "ui/message_center/views/notifier_settings_view.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/animation/bounds_animator_observer.h" #include "ui/views/background.h" diff --git a/ui/message_center/views/message_view.cc b/ui/message_center/views/message_view.cc index fa1137b..f00a88b 100644 --- a/ui/message_center/views/message_view.cc +++ b/ui/message_center/views/message_view.cc @@ -4,7 +4,6 @@ #include "ui/message_center/views/message_view.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" @@ -15,6 +14,7 @@ #include "ui/message_center/message_center.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/views/padded_button.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" diff --git a/ui/message_center/views/notification_view.cc b/ui/message_center/views/notification_view.cc index 0947af8..480ec83 100644 --- a/ui/message_center/views/notification_view.cc +++ b/ui/message_center/views/notification_view.cc @@ -8,7 +8,6 @@ #include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/base/cursor/cursor.h" #include "ui/base/layout.h" @@ -27,6 +26,7 @@ #include "ui/message_center/views/padded_button.h" #include "ui/message_center/views/proportional_image_view.h" #include "ui/native_theme/native_theme.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/border.h" #include "ui/views/controls/button/image_button.h" diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc index 80cb402..10460f3 100644 --- a/ui/message_center/views/notifier_settings_view.cc +++ b/ui/message_center/views/notifier_settings_view.cc @@ -9,7 +9,6 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkColor.h" @@ -22,6 +21,7 @@ #include "ui/gfx/size.h" #include "ui/message_center/message_center_style.h" #include "ui/message_center/views/message_center_view.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/border.h" #include "ui/views/controls/button/checkbox.h" diff --git a/ui/native_theme/DEPS b/ui/native_theme/DEPS index 5abd803..79d347c 100644 --- a/ui/native_theme/DEPS +++ b/ui/native_theme/DEPS @@ -1,7 +1,7 @@ include_rules = [ - "+grit/ui_resources.h", "+skia/ext", "+third_party/skia", "+ui/base", "+ui/gfx", + "+ui/resources/grit/ui_resources.h", ] diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc index 3e1bd95..f57fe4a 100644 --- a/ui/native_theme/common_theme.cc +++ b/ui/native_theme/common_theme.cc @@ -5,7 +5,6 @@ #include "ui/native_theme/common_theme.h" #include "base/logging.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkCanvas.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" @@ -14,6 +13,7 @@ #include "ui/gfx/rect.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/sys_color_change_listener.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/ui/native_theme/native_theme_aura.cc b/ui/native_theme/native_theme_aura.cc index 514076f..362ff99 100644 --- a/ui/native_theme/native_theme_aura.cc +++ b/ui/native_theme/native_theme_aura.cc @@ -7,7 +7,6 @@ #include <limits> #include "base/logging.h" -#include "grit/ui_resources.h" #include "ui/base/layout.h" #include "ui/base/nine_image_painter_factory.h" #include "ui/gfx/canvas.h" @@ -20,6 +19,7 @@ #include "ui/gfx/skia_util.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme_switches.h" +#include "ui/resources/grit/ui_resources.h" using gfx::NineImagePainter; diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc index 1e1e76f..c2195a3 100644 --- a/ui/native_theme/native_theme_base.cc +++ b/ui/native_theme/native_theme_base.cc @@ -9,7 +9,6 @@ #include "base/command_line.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" @@ -21,6 +20,7 @@ #include "ui/gfx/size.h" #include "ui/gfx/skia_util.h" #include "ui/native_theme/common_theme.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/ui/views/DEPS b/ui/views/DEPS index 4a975db..6f0702e 100644 --- a/ui/views/DEPS +++ b/ui/views/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+grit/ui_resources.h", "+grit/ui_strings.h", "+skia/ext", "+third_party/iaccessible2", @@ -14,6 +13,7 @@ include_rules = [ "+ui/gl/gl_surface.h", # To initialize GL for tests. "+ui/native_theme", "+ui/ozone/public", + "+ui/resources/grit/ui_resources.h", "+ui/wm/core", "+ui/wm/public", diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc index 03b422a..1e97f61 100644 --- a/ui/views/bubble/bubble_border.cc +++ b/ui/views/bubble/bubble_border.cc @@ -8,12 +8,12 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/rect.h" #include "ui/gfx/skia_util.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/painter.h" #include "ui/views/view.h" diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc index 384c4fa..e49956b 100644 --- a/ui/views/bubble/bubble_frame_view.cc +++ b/ui/views/bubble/bubble_frame_view.cc @@ -6,13 +6,13 @@ #include <algorithm> -#include "grit/ui_resources.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/path.h" #include "ui/gfx/screen.h" #include "ui/gfx/skia_util.h" #include "ui/native_theme/native_theme.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/bubble/bubble_border.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc index 15a8c88..e3be0e7 100644 --- a/ui/views/button_drag_utils.cc +++ b/ui/views/button_drag_utils.cc @@ -5,13 +5,13 @@ #include "ui/views/button_drag_utils.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "ui/base/dragdrop/drag_utils.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/drag_utils.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/controls/button/blue_button.cc b/ui/views/controls/button/blue_button.cc index 74112d1..8bae234 100644 --- a/ui/views/controls/button/blue_button.cc +++ b/ui/views/controls/button/blue_button.cc @@ -4,9 +4,9 @@ #include "ui/views/controls/button/blue_button.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/sys_color_change_listener.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/label_button_border.h" namespace views { diff --git a/ui/views/controls/button/checkbox.cc b/ui/views/controls/button/checkbox.cc index 0c212c4..e67dc64 100644 --- a/ui/views/controls/button/checkbox.cc +++ b/ui/views/controls/button/checkbox.cc @@ -4,9 +4,9 @@ #include "ui/views/controls/button/checkbox.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/label_button_border.h" #include "ui/views/painter.h" diff --git a/ui/views/controls/button/label_button_border.cc b/ui/views/controls/button/label_button_border.cc index 23e9319..587e76b 100644 --- a/ui/views/controls/button/label_button_border.cc +++ b/ui/views/controls/button/label_button_border.cc @@ -5,7 +5,6 @@ #include "ui/views/controls/button/label_button_border.h" #include "base/logging.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/effects/SkLerpXfermode.h" #include "ui/base/resource/resource_bundle.h" @@ -15,6 +14,7 @@ #include "ui/gfx/skia_util.h" #include "ui/gfx/sys_color_change_listener.h" #include "ui/native_theme/native_theme.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/border.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/native_theme_delegate.h" diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc index 08de0bc..cb47bb0 100644 --- a/ui/views/controls/button/menu_button.cc +++ b/ui/views/controls/button/menu_button.cc @@ -5,7 +5,6 @@ #include "ui/views/controls/button/menu_button.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" @@ -17,6 +16,7 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/screen.h" #include "ui/gfx/text_constants.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/menu_button_listener.h" #include "ui/views/mouse_constants.h" diff --git a/ui/views/controls/button/radio_button.cc b/ui/views/controls/button/radio_button.cc index a015d5e..e92b06a 100644 --- a/ui/views/controls/button/radio_button.cc +++ b/ui/views/controls/button/radio_button.cc @@ -5,9 +5,9 @@ #include "ui/views/controls/button/radio_button.h" #include "base/logging.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/widget/widget.h" namespace views { diff --git a/ui/views/controls/combobox/combobox.cc b/ui/views/controls/combobox/combobox.cc index ab81387..bbba555 100644 --- a/ui/views/controls/combobox/combobox.cc +++ b/ui/views/controls/combobox/combobox.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/message_loop/message_loop_proxy.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/models/combobox_model.h" #include "ui/base/resource/resource_bundle.h" @@ -21,6 +20,7 @@ #include "ui/gfx/text_utils.h" #include "ui/native_theme/common_theme.h" #include "ui/native_theme/native_theme.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/color_constants.h" #include "ui/views/controls/button/custom_button.h" diff --git a/ui/views/controls/menu/menu_config_aura.cc b/ui/views/controls/menu/menu_config_aura.cc index 2e464d2..911e3fa 100644 --- a/ui/views/controls/menu/menu_config_aura.cc +++ b/ui/views/controls/menu/menu_config_aura.cc @@ -4,12 +4,12 @@ #include "ui/views/controls/menu/menu_config.h" -#include "grit/ui_resources.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" #include "ui/native_theme/native_theme_aura.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/menu/menu_image_util.h" namespace views { diff --git a/ui/views/controls/menu/menu_image_util.cc b/ui/views/controls/menu/menu_image_util.cc index 6031573..c85afd7 100644 --- a/ui/views/controls/menu/menu_image_util.cc +++ b/ui/views/controls/menu/menu_image_util.cc @@ -6,7 +6,6 @@ #include "base/i18n/rtl.h" #include "base/logging.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" @@ -16,6 +15,7 @@ #include "ui/gfx/image/image_skia_source.h" #include "ui/gfx/point.h" #include "ui/gfx/size.h" +#include "ui/resources/grit/ui_resources.h" namespace { diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc index 68e58a0..f8b7c24 100644 --- a/ui/views/controls/menu/menu_item_view.cc +++ b/ui/views/controls/menu/menu_item_view.cc @@ -7,7 +7,6 @@ #include "base/i18n/case_conversion.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" @@ -18,6 +17,7 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/text_utils.h" #include "ui/native_theme/common_theme.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/menu/menu_config.h" diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc index 74e803d..71d719e 100644 --- a/ui/views/controls/slider.cc +++ b/ui/views/controls/slider.cc @@ -10,7 +10,6 @@ #include "base/message_loop/message_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" @@ -21,6 +20,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/widget/widget.h" namespace { diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc index 5df3560..d1d5c1d 100644 --- a/ui/views/controls/throbber.cc +++ b/ui/views/controls/throbber.cc @@ -5,11 +5,11 @@ #include "ui/views/controls/throbber.h" #include "base/time/time.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" +#include "ui/resources/grit/ui_resources.h" using base::Time; using base::TimeDelta; diff --git a/ui/views/controls/tree/tree_view.cc b/ui/views/controls/tree/tree_view.cc index f514fe4..4650620 100644 --- a/ui/views/controls/tree/tree_view.cc +++ b/ui/views/controls/tree/tree_view.cc @@ -8,7 +8,6 @@ #include "base/i18n/rtl.h" #include "base/message_loop/message_loop.h" -#include "grit/ui_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" @@ -19,6 +18,7 @@ #include "ui/gfx/rect_conversions.h" #include "ui/gfx/skia_util.h" #include "ui/native_theme/native_theme.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/prefix_selector.h" #include "ui/views/controls/scroll_view.h" #include "ui/views/controls/textfield/textfield.h" diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc index 66bb7a1..100b4ce 100644 --- a/ui/views/examples/button_example.cc +++ b/ui/views/examples/button_example.cc @@ -5,9 +5,9 @@ #include "ui/views/examples/button_example.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/background.h" #include "ui/views/controls/button/blue_button.h" #include "ui/views/controls/button/image_button.h" diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 3e005a6..ebcc745 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -5,7 +5,6 @@ #include "ui/views/touchui/touch_selection_controller_impl.h" #include "base/time/time.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/aura/client/cursor_client.h" #include "ui/aura/env.h" @@ -17,6 +16,7 @@ #include "ui/gfx/rect.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/masked_window_targeter.h" #include "ui/wm/core/window_animations.h" diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc index 73cf4f0..acd62ff 100644 --- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc +++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc @@ -4,7 +4,6 @@ #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "ui/aura/client/screen_position_client.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" @@ -15,6 +14,7 @@ #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/gfx/render_text.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/textfield/textfield_test_api.h" #include "ui/views/test/views_test_base.h" diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc index a3fb3f7..7dc62a3 100644 --- a/ui/views/window/custom_frame_view.cc +++ b/ui/views/window/custom_frame_view.cc @@ -8,7 +8,6 @@ #include <vector> #include "base/strings/utf_string_conversions.h" -#include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_util.h" @@ -18,6 +17,7 @@ #include "ui/gfx/image/image.h" #include "ui/gfx/path.h" #include "ui/gfx/rect.h" +#include "ui/resources/grit/ui_resources.h" #include "ui/views/color_constants.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/views_delegate.h" diff --git a/ui/wm/core/DEPS b/ui/wm/core/DEPS index ddcff7e..5f0828e 100644 --- a/ui/wm/core/DEPS +++ b/ui/wm/core/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+grit/ui_resources.h", + "+third_party/skia", "+ui/aura", "+ui/base/accelerators", "+ui/base/cursor", @@ -11,6 +11,6 @@ include_rules = [ "+ui/compositor", "+ui/events", "+ui/gfx", + "+ui/resources/grit/ui_resources.h", "+ui/views/views_export.h", - "+third_party/skia", ] diff --git a/ui/wm/core/shadow.cc b/ui/wm/core/shadow.cc index aa89d3f..0395a4a 100644 --- a/ui/wm/core/shadow.cc +++ b/ui/wm/core/shadow.cc @@ -4,11 +4,11 @@ #include "ui/wm/core/shadow.h" -#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/resources/grit/ui_resources.h" namespace { |