diff options
163 files changed, 169 insertions, 154 deletions
diff --git a/app/app.gyp b/app/app.gyp index daad466..88233b0 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -40,23 +40,6 @@ }], ], }, - { - 'target_name': 'app_resources', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app/app_resources', - }, - 'actions': [ - { - 'action_name': 'app_resources', - 'variables': { - 'grit_grd_file': 'resources/app_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../build/grit_target.gypi' ], - }, ], } diff --git a/app/resources/app_top_center.png b/app/resources/app_top_center.png Binary files differdeleted file mode 100644 index 46f8f96..0000000 --- a/app/resources/app_top_center.png +++ /dev/null diff --git a/app/resources/app_top_left.png b/app/resources/app_top_left.png Binary files differdeleted file mode 100644 index 797006f..0000000 --- a/app/resources/app_top_left.png +++ /dev/null diff --git a/app/resources/app_top_right.png b/app/resources/app_top_right.png Binary files differdeleted file mode 100644 index 25b59f2..0000000 --- a/app/resources/app_top_right.png +++ /dev/null diff --git a/app/resources/browser_action_badge_center.png b/app/resources/browser_action_badge_center.png Binary files differdeleted file mode 100644 index 289d5ef..0000000 --- a/app/resources/browser_action_badge_center.png +++ /dev/null diff --git a/app/resources/browser_action_badge_left.png b/app/resources/browser_action_badge_left.png Binary files differdeleted file mode 100644 index bb7581d..0000000 --- a/app/resources/browser_action_badge_left.png +++ /dev/null diff --git a/app/resources/browser_action_badge_right.png b/app/resources/browser_action_badge_right.png Binary files differdeleted file mode 100644 index b5fd5e3..0000000 --- a/app/resources/browser_action_badge_right.png +++ /dev/null diff --git a/app/resources/close.png b/app/resources/close.png Binary files differdeleted file mode 100644 index 6217569..0000000 --- a/app/resources/close.png +++ /dev/null diff --git a/app/resources/close_h.png b/app/resources/close_h.png Binary files differdeleted file mode 100644 index 9921435..0000000 --- a/app/resources/close_h.png +++ /dev/null diff --git a/app/resources/close_p.png b/app/resources/close_p.png Binary files differdeleted file mode 100644 index 0487e4a..0000000 --- a/app/resources/close_p.png +++ /dev/null diff --git a/app/resources/close_sa.png b/app/resources/close_sa.png Binary files differdeleted file mode 100644 index 12ae813..0000000 --- a/app/resources/close_sa.png +++ /dev/null diff --git a/app/resources/close_sa_h.png b/app/resources/close_sa_h.png Binary files differdeleted file mode 100644 index d5a7a42..0000000 --- a/app/resources/close_sa_h.png +++ /dev/null diff --git a/app/resources/close_sa_p.png b/app/resources/close_sa_p.png Binary files differdeleted file mode 100644 index c1d7c91..0000000 --- a/app/resources/close_sa_p.png +++ /dev/null diff --git a/app/resources/content_bottom_center.png b/app/resources/content_bottom_center.png Binary files differdeleted file mode 100644 index efce9cf..0000000 --- a/app/resources/content_bottom_center.png +++ /dev/null diff --git a/app/resources/content_bottom_left_corner.png b/app/resources/content_bottom_left_corner.png Binary files differdeleted file mode 100644 index db7b04f..0000000 --- a/app/resources/content_bottom_left_corner.png +++ /dev/null diff --git a/app/resources/content_bottom_right_corner.png b/app/resources/content_bottom_right_corner.png Binary files differdeleted file mode 100644 index d4c0136..0000000 --- a/app/resources/content_bottom_right_corner.png +++ /dev/null diff --git a/app/resources/content_left_side.png b/app/resources/content_left_side.png Binary files differdeleted file mode 100644 index 93bc64b..0000000 --- a/app/resources/content_left_side.png +++ /dev/null diff --git a/app/resources/content_right_side.png b/app/resources/content_right_side.png Binary files differdeleted file mode 100644 index 598858b..0000000 --- a/app/resources/content_right_side.png +++ /dev/null diff --git a/app/resources/default_favicon.png b/app/resources/default_favicon.png Binary files differdeleted file mode 100644 index 180ab15..0000000 --- a/app/resources/default_favicon.png +++ /dev/null diff --git a/app/resources/folder_closed.png b/app/resources/folder_closed.png Binary files differdeleted file mode 100644 index 746fab9..0000000 --- a/app/resources/folder_closed.png +++ /dev/null diff --git a/app/resources/folder_closed_rtl.png b/app/resources/folder_closed_rtl.png Binary files differdeleted file mode 100644 index dbd0b0a..0000000 --- a/app/resources/folder_closed_rtl.png +++ /dev/null diff --git a/app/resources/folder_open.png b/app/resources/folder_open.png Binary files differdeleted file mode 100644 index 3276810..0000000 --- a/app/resources/folder_open.png +++ /dev/null diff --git a/app/resources/folder_open_rtl.png b/app/resources/folder_open_rtl.png Binary files differdeleted file mode 100644 index 9ba7069..0000000 --- a/app/resources/folder_open_rtl.png +++ /dev/null diff --git a/app/resources/frame_app_panel_default.png b/app/resources/frame_app_panel_default.png Binary files differdeleted file mode 100644 index aea7e28..0000000 --- a/app/resources/frame_app_panel_default.png +++ /dev/null diff --git a/app/resources/frame_default.png b/app/resources/frame_default.png Binary files differdeleted file mode 100644 index ca9bcb2..0000000 --- a/app/resources/frame_default.png +++ /dev/null diff --git a/app/resources/frame_default_inactive.png b/app/resources/frame_default_inactive.png Binary files differdeleted file mode 100644 index 348e2ce..0000000 --- a/app/resources/frame_default_inactive.png +++ /dev/null diff --git a/app/resources/input_good.png b/app/resources/input_good.png Binary files differdeleted file mode 100644 index 1646cd5..0000000 --- a/app/resources/input_good.png +++ /dev/null diff --git a/app/resources/large_throbber.png b/app/resources/large_throbber.png Binary files differdeleted file mode 100644 index fdf9ea7..0000000 --- a/app/resources/large_throbber.png +++ /dev/null diff --git a/app/resources/linux_close.png b/app/resources/linux_close.png Binary files differdeleted file mode 100644 index 1fac329..0000000 --- a/app/resources/linux_close.png +++ /dev/null diff --git a/app/resources/linux_close_h.png b/app/resources/linux_close_h.png Binary files differdeleted file mode 100644 index 5b47dfc..0000000 --- a/app/resources/linux_close_h.png +++ /dev/null diff --git a/app/resources/linux_close_p.png b/app/resources/linux_close_p.png Binary files differdeleted file mode 100644 index a41c353..0000000 --- a/app/resources/linux_close_p.png +++ /dev/null diff --git a/app/resources/linux_maximize.png b/app/resources/linux_maximize.png Binary files differdeleted file mode 100644 index b1069b1..0000000 --- a/app/resources/linux_maximize.png +++ /dev/null diff --git a/app/resources/linux_maximize_h.png b/app/resources/linux_maximize_h.png Binary files differdeleted file mode 100644 index 69c7074..0000000 --- a/app/resources/linux_maximize_h.png +++ /dev/null diff --git a/app/resources/linux_maximize_p.png b/app/resources/linux_maximize_p.png Binary files differdeleted file mode 100644 index bd45a96..0000000 --- a/app/resources/linux_maximize_p.png +++ /dev/null diff --git a/app/resources/linux_minimize.png b/app/resources/linux_minimize.png Binary files differdeleted file mode 100644 index 751f143..0000000 --- a/app/resources/linux_minimize.png +++ /dev/null diff --git a/app/resources/linux_minimize_h.png b/app/resources/linux_minimize_h.png Binary files differdeleted file mode 100644 index 31895a1..0000000 --- a/app/resources/linux_minimize_h.png +++ /dev/null diff --git a/app/resources/linux_minimize_p.png b/app/resources/linux_minimize_p.png Binary files differdeleted file mode 100644 index 417bd6d..0000000 --- a/app/resources/linux_minimize_p.png +++ /dev/null diff --git a/app/resources/linux_restore.png b/app/resources/linux_restore.png Binary files differdeleted file mode 100644 index 8b3e095..0000000 --- a/app/resources/linux_restore.png +++ /dev/null diff --git a/app/resources/linux_restore_h.png b/app/resources/linux_restore_h.png Binary files differdeleted file mode 100644 index 730a931..0000000 --- a/app/resources/linux_restore_h.png +++ /dev/null diff --git a/app/resources/linux_restore_p.png b/app/resources/linux_restore_p.png Binary files differdeleted file mode 100644 index a75f0ba..0000000 --- a/app/resources/linux_restore_p.png +++ /dev/null diff --git a/app/resources/maximize.png b/app/resources/maximize.png Binary files differdeleted file mode 100644 index 5fb89e2..0000000 --- a/app/resources/maximize.png +++ /dev/null diff --git a/app/resources/maximize_h.png b/app/resources/maximize_h.png Binary files differdeleted file mode 100644 index ab326b1..0000000 --- a/app/resources/maximize_h.png +++ /dev/null diff --git a/app/resources/maximize_p.png b/app/resources/maximize_p.png Binary files differdeleted file mode 100644 index 6c92c75..0000000 --- a/app/resources/maximize_p.png +++ /dev/null diff --git a/app/resources/menu_arrow.png b/app/resources/menu_arrow.png Binary files differdeleted file mode 100644 index 24ed897..0000000 --- a/app/resources/menu_arrow.png +++ /dev/null diff --git a/app/resources/menu_check.png b/app/resources/menu_check.png Binary files differdeleted file mode 100644 index dd714e0..0000000 --- a/app/resources/menu_check.png +++ /dev/null diff --git a/app/resources/menu_droparrow.png b/app/resources/menu_droparrow.png Binary files differdeleted file mode 100644 index cc0f545..0000000 --- a/app/resources/menu_droparrow.png +++ /dev/null diff --git a/app/resources/menu_droparrow_sharp.png b/app/resources/menu_droparrow_sharp.png Binary files differdeleted file mode 100644 index f78ecc3..0000000 --- a/app/resources/menu_droparrow_sharp.png +++ /dev/null diff --git a/app/resources/minimize.png b/app/resources/minimize.png Binary files differdeleted file mode 100644 index fe0ab2f..0000000 --- a/app/resources/minimize.png +++ /dev/null diff --git a/app/resources/minimize_h.png b/app/resources/minimize_h.png Binary files differdeleted file mode 100644 index 6bceb24..0000000 --- a/app/resources/minimize_h.png +++ /dev/null diff --git a/app/resources/minimize_p.png b/app/resources/minimize_p.png Binary files differdeleted file mode 100644 index 62b2f77..0000000 --- a/app/resources/minimize_p.png +++ /dev/null diff --git a/app/resources/restore.png b/app/resources/restore.png Binary files differdeleted file mode 100644 index bb70f2d..0000000 --- a/app/resources/restore.png +++ /dev/null diff --git a/app/resources/restore_h.png b/app/resources/restore_h.png Binary files differdeleted file mode 100644 index 96851ef..0000000 --- a/app/resources/restore_h.png +++ /dev/null diff --git a/app/resources/restore_p.png b/app/resources/restore_p.png Binary files differdeleted file mode 100644 index 96851ef..0000000 --- a/app/resources/restore_p.png +++ /dev/null diff --git a/app/resources/textbutton_b_h.png b/app/resources/textbutton_b_h.png Binary files differdeleted file mode 100644 index 169db96..0000000 --- a/app/resources/textbutton_b_h.png +++ /dev/null diff --git a/app/resources/textbutton_b_p.png b/app/resources/textbutton_b_p.png Binary files differdeleted file mode 100644 index f1fb512..0000000 --- a/app/resources/textbutton_b_p.png +++ /dev/null diff --git a/app/resources/textbutton_bl_h.png b/app/resources/textbutton_bl_h.png Binary files differdeleted file mode 100644 index f45f0e8..0000000 --- a/app/resources/textbutton_bl_h.png +++ /dev/null diff --git a/app/resources/textbutton_bl_p.png b/app/resources/textbutton_bl_p.png Binary files differdeleted file mode 100644 index 06712be..0000000 --- a/app/resources/textbutton_bl_p.png +++ /dev/null diff --git a/app/resources/textbutton_br_h.png b/app/resources/textbutton_br_h.png Binary files differdeleted file mode 100644 index e8f3b1f..0000000 --- a/app/resources/textbutton_br_h.png +++ /dev/null diff --git a/app/resources/textbutton_br_p.png b/app/resources/textbutton_br_p.png Binary files differdeleted file mode 100644 index a84c385..0000000 --- a/app/resources/textbutton_br_p.png +++ /dev/null diff --git a/app/resources/textbutton_c_h.png b/app/resources/textbutton_c_h.png Binary files differdeleted file mode 100644 index 6188590..0000000 --- a/app/resources/textbutton_c_h.png +++ /dev/null diff --git a/app/resources/textbutton_c_p.png b/app/resources/textbutton_c_p.png Binary files differdeleted file mode 100644 index 2925888..0000000 --- a/app/resources/textbutton_c_p.png +++ /dev/null diff --git a/app/resources/textbutton_l_h.png b/app/resources/textbutton_l_h.png Binary files differdeleted file mode 100644 index 4e3b7ab..0000000 --- a/app/resources/textbutton_l_h.png +++ /dev/null diff --git a/app/resources/textbutton_l_p.png b/app/resources/textbutton_l_p.png Binary files differdeleted file mode 100644 index 8641049..0000000 --- a/app/resources/textbutton_l_p.png +++ /dev/null diff --git a/app/resources/textbutton_r_h.png b/app/resources/textbutton_r_h.png Binary files differdeleted file mode 100644 index 946c5ef..0000000 --- a/app/resources/textbutton_r_h.png +++ /dev/null diff --git a/app/resources/textbutton_r_p.png b/app/resources/textbutton_r_p.png Binary files differdeleted file mode 100644 index e4f7f34..0000000 --- a/app/resources/textbutton_r_p.png +++ /dev/null diff --git a/app/resources/textbutton_t_h.png b/app/resources/textbutton_t_h.png Binary files differdeleted file mode 100644 index 11285e0..0000000 --- a/app/resources/textbutton_t_h.png +++ /dev/null diff --git a/app/resources/textbutton_t_p.png b/app/resources/textbutton_t_p.png Binary files differdeleted file mode 100644 index c212b4f..0000000 --- a/app/resources/textbutton_t_p.png +++ /dev/null diff --git a/app/resources/textbutton_tl_h.png b/app/resources/textbutton_tl_h.png Binary files differdeleted file mode 100644 index 51208bc..0000000 --- a/app/resources/textbutton_tl_h.png +++ /dev/null diff --git a/app/resources/textbutton_tl_p.png b/app/resources/textbutton_tl_p.png Binary files differdeleted file mode 100644 index 6422023..0000000 --- a/app/resources/textbutton_tl_p.png +++ /dev/null diff --git a/app/resources/textbutton_tr_h.png b/app/resources/textbutton_tr_h.png Binary files differdeleted file mode 100644 index f07e92ff..0000000 --- a/app/resources/textbutton_tr_h.png +++ /dev/null diff --git a/app/resources/textbutton_tr_p.png b/app/resources/textbutton_tr_p.png Binary files differdeleted file mode 100644 index ab87ec6..0000000 --- a/app/resources/textbutton_tr_p.png +++ /dev/null diff --git a/app/resources/throbber.png b/app/resources/throbber.png Binary files differdeleted file mode 100644 index 6ca1fdd..0000000 --- a/app/resources/throbber.png +++ /dev/null diff --git a/app/resources/window_bottom_center.png b/app/resources/window_bottom_center.png Binary files differdeleted file mode 100644 index 3fb76f1..0000000 --- a/app/resources/window_bottom_center.png +++ /dev/null diff --git a/app/resources/window_bottom_left_corner.png b/app/resources/window_bottom_left_corner.png Binary files differdeleted file mode 100644 index 88c420c..0000000 --- a/app/resources/window_bottom_left_corner.png +++ /dev/null diff --git a/app/resources/window_bottom_right_corner.png b/app/resources/window_bottom_right_corner.png Binary files differdeleted file mode 100644 index 2595f0c..0000000 --- a/app/resources/window_bottom_right_corner.png +++ /dev/null diff --git a/app/resources/window_left_side.png b/app/resources/window_left_side.png Binary files differdeleted file mode 100644 index 2553d1b..0000000 --- a/app/resources/window_left_side.png +++ /dev/null diff --git a/app/resources/window_right_side.png b/app/resources/window_right_side.png Binary files differdeleted file mode 100644 index c89b47b..0000000 --- a/app/resources/window_right_side.png +++ /dev/null diff --git a/app/resources/window_top_center.png b/app/resources/window_top_center.png Binary files differdeleted file mode 100644 index e2c393e..0000000 --- a/app/resources/window_top_center.png +++ /dev/null diff --git a/app/resources/window_top_left_corner.png b/app/resources/window_top_left_corner.png Binary files differdeleted file mode 100644 index 4bb52ce..0000000 --- a/app/resources/window_top_left_corner.png +++ /dev/null diff --git a/app/resources/window_top_right_corner.png b/app/resources/window_top_right_corner.png Binary files differdeleted file mode 100644 index d1da9ca..0000000 --- a/app/resources/window_top_right_corner.png +++ /dev/null diff --git a/chrome/app/locales/locales.gyp b/chrome/app/locales/locales.gyp index d035f4b..42e6944 100644 --- a/chrome/app/locales/locales.gyp +++ b/chrome/app/locales/locales.gyp @@ -4,7 +4,7 @@ 'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', - 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', + 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui', 'app_strings_out_dir': '<(app_grit_out_dir)/app_strings', 'app_locale_out_dir': '<(app_grit_out_dir)/app_locale_settings', diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 722deb29..f16f11f 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -56,7 +56,7 @@ #include "content/browser/worker_host/worker_process_host.h" #include "content/common/bindings_policy.h" #include "content/common/desktop_notification_messages.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "net/base/cookie_monster.h" #include "net/base/cookie_options.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index 5eb73ac6..0150a09 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -21,9 +21,9 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/wm_ipc.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" #include "third_party/skia/include/effects/SkBlurMaskFilter.h" #include "third_party/skia/include/effects/SkGradientShader.h" diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc index dc07f71..7948bf6 100644 --- a/chrome/browser/chromeos/login/new_user_view.cc +++ b/chrome/browser/chromeos/login/new_user_view.cc @@ -25,9 +25,9 @@ #include "chrome/browser/chromeos/views/copy_background.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/pref_names.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "grit/ui_resources.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index f4d18f7..49f342d 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -15,9 +15,9 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/extensions/extension_service.h" #include "content/browser/in_process_webkit/webkit_context.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "net/base/cookie_monster.h" #include "net/base/registry_controlled_domain.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index e258b20..3e9fd56 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -14,8 +14,8 @@ #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "grit/ui_resources.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc index 15b5917..ca0ade6 100644 --- a/chrome/browser/possible_url_model.cc +++ b/chrome/browser/possible_url_model.cc @@ -13,8 +13,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/browser/cancelable_request.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/table_model_observer.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc index eccab4e..4544ff80 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc @@ -12,11 +12,11 @@ #include "chrome/browser/google/google_util.h" #include "chrome/common/jstemplate_builder.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc index 3f356f3..4dd404b 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" -#include "testing/gtest/include/gtest/gtest.h" +#include "grit/ui_resources.h" #include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" using testing::HasSubstr; diff --git a/chrome/browser/resources/bookmark_manager/css/bmm.css b/chrome/browser/resources/bookmark_manager/css/bmm.css index d85ac57..a11d44a 100644 --- a/chrome/browser/resources/bookmark_manager/css/bmm.css +++ b/chrome/browser/resources/bookmark_manager/css/bmm.css @@ -54,7 +54,7 @@ html[dir=rtl] list .label { } list > .folder > .label { - background-image: url("../../../../../app/resources/folder_closed.png"); + background-image: url("../../../../../ui/resources/folder_closed.png"); } /* We need to ensure that even empty labels take up space */ @@ -156,7 +156,7 @@ list [editing] .url { /* end editing */ html[dir=rtl] list > .folder > .label { - background-image: url("../../../../../app/resources/folder_closed_rtl.png"); + background-image: url("../../../../../ui/resources/folder_closed_rtl.png"); } html[os=mac] list > .folder > .label { diff --git a/chrome/browser/resources/shared/css/tree.css b/chrome/browser/resources/shared/css/tree.css index 482c0c8..4a1f705 100644 --- a/chrome/browser/resources/shared/css/tree.css +++ b/chrome/browser/resources/shared/css/tree.css @@ -100,7 +100,7 @@ tree:focus .tree-row[selected] { .tree-label { -webkit-padding-start: 20px; - background-image: url("../../../../../app/resources/folder_closed.png"); + background-image: url("../../../../../ui/resources/folder_closed.png"); background-position: 0 50%; background-repeat: no-repeat; white-space: pre; @@ -125,15 +125,15 @@ html[dir=rtl] .tree-label { } .tree-row[selected] > .tree-label { - background-image: url("../../../../../app/resources/folder_open.png"); + background-image: url("../../../../../ui/resources/folder_open.png"); } html[dir='rtl'] .tree-label { - background-image: url("../../../../../app/resources/folder_closed_rtl.png"); + background-image: url("../../../../../ui/resources/folder_closed_rtl.png"); } html[dir='rtl'] .tree-row[selected] > .tree-label { - background-image: url("../../../../../app/resources/folder_open_rtl.png"); + background-image: url("../../../../../ui/resources/folder_open_rtl.png"); } .tree-item[editing] input { diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index 073d82e..022ad6e 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -8,8 +8,8 @@ #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" #include "base/process_util.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/background/background_contents_service.h" @@ -31,9 +31,9 @@ #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/result_codes.h" -#include "grit/app_resources.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/base/text/bytes_formatting.h" diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 20603d8..e43a485 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -11,9 +11,9 @@ #include "base/values.h" #include "chrome/browser/themes/theme_service.h" #include "content/browser/browser_thread.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 196aacb..6c301d3 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -15,9 +15,9 @@ #include "content/browser/user_metrics.h" #include "content/common/notification_service.h" #include "content/common/notification_type.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index bea0249..70a1854 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -43,9 +43,9 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/user_metrics.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 1fd1198..96781f8 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -19,9 +19,9 @@ #include "chrome/common/url_constants.h" #include "content/common/notification_registrar.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index 9d6f6b8..bbd0a60 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -20,10 +20,10 @@ #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/result_codes.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/menu_controller_unittest.mm b/chrome/browser/ui/cocoa/menu_controller_unittest.mm index 21f3db9a..928923d 100644 --- a/chrome/browser/ui/cocoa/menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/menu_controller_unittest.mm @@ -9,8 +9,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/menu_controller.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 64179f3..1912c16 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -32,8 +32,8 @@ #include "content/browser/renderer_host/backing_store_mac.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/utils/mac/SkCGUtils.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index eebd88d..d84b58e 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -55,10 +55,10 @@ #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/user_metrics.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm index b07cf4c..f41d0ad 100644 --- a/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/throbber_view_unittest.mm @@ -5,9 +5,9 @@ #import <Cocoa/Cocoa.h> #include "base/memory/scoped_nsobject.h" -#import "chrome/browser/ui/cocoa/tabs/throbber_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "grit/app_resources.h" +#import "chrome/browser/ui/cocoa/tabs/throbber_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" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index 23a97ea..1ec64b3 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -42,9 +42,9 @@ #include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/user_metrics.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia_paint.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc index e564f80..2f3cade 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc @@ -17,9 +17,9 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/menu_gtk.h" #include "content/browser/tab_contents/page_navigator.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "ui/base/dragdrop/gtk_dnd_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 3f4692a..42863a5 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -34,9 +34,9 @@ #include "content/common/notification_service.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 59ed94e..a166d13 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -38,10 +38,10 @@ #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index d1d43a0..85fa82cb 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -78,18 +78,18 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/browser/debugger/devtools_window.h" -#include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/native_web_keyboard_event.h" #include "content/common/notification_service.h" #include "content/common/view_messages.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc index cfebabf..0b94783 100644 --- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc @@ -20,8 +20,8 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" #include "ui/gfx/gtk_util.h" diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc index 2d79c67..c501103 100644 --- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc @@ -17,9 +17,9 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.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" diff --git a/chrome/browser/ui/gtk/gtk_chrome_button.cc b/chrome/browser/ui/gtk/gtk_chrome_button.cc index b08427a..d9ed9a2 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_button.cc +++ b/chrome/browser/ui/gtk/gtk_chrome_button.cc @@ -6,7 +6,7 @@ #include "base/basictypes.h" #include "chrome/browser/ui/gtk/nine_box.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "ui/gfx/gtk_util.h" namespace { diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index 637b41f..696826c 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -29,9 +29,9 @@ #include "content/common/notification_service.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.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/SkColor.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index 7b812df..dda7ae0 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -20,10 +20,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index 5441cfc..9a7c251 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc @@ -27,9 +27,9 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" #include "content/common/notification_type.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/gtk_dnd_util.h" diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index fe0a1ca..ebcb3b8 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -26,8 +26,8 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc index 9b263ac..ae647ac 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.cc +++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc @@ -13,10 +13,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/browser/tab_contents/tab_contents.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.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 aa10bb8..7202ced 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -12,8 +12,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" diff --git a/chrome/browser/ui/touch/tabs/touch_tab.cc b/chrome/browser/ui/touch/tabs/touch_tab.cc index 837ef50..faccf75 100644 --- a/chrome/browser/ui/touch/tabs/touch_tab.cc +++ b/chrome/browser/ui/touch/tabs/touch_tab.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "chrome/browser/themes/theme_service.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index c6362b9..25a0c4f 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -40,9 +40,9 @@ #include "content/browser/user_metrics.h" #include "content/common/notification_service.h" #include "content/common/page_transition_types.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/dragdrop/os_exchange_data.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index 7153b8e..a42d65d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -18,9 +18,9 @@ #include "content/browser/tab_contents/page_navigator.h" #include "content/browser/user_metrics.h" #include "content/common/page_transition_types.h" -#include "grit/app_resources.h" #include "grit/generated_resources.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 "views/controls/button/menu_button.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 4f2bd0e..1421700 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -17,9 +17,9 @@ #include "content/browser/tab_contents/page_navigator.h" #include "content/browser/user_metrics.h" #include "content/common/page_transition_types.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index 0c8711f..63f4e9d 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -29,10 +29,10 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_source.h" #include "content/common/notification_type.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/accessibility/accessible_view_state.h" diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index 5679c37..3d83490 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -15,11 +15,11 @@ #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "net/base/net_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 767593e..81cdeb2cf 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -10,9 +10,9 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.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 "views/controls/image_view.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 a5ed604..1977a94 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 @@ -9,10 +9,10 @@ #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "content/browser/tab_contents/tab_contents.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 055f444..dd401d3 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -82,12 +82,12 @@ #include "content/common/content_switches.h" #include "content/common/notification_service.h" #include "content/common/view_messages.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "grit/webkit_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.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 19797c9..1576cd4 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -20,10 +20,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.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" 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 45ab99f..5112f1b 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -20,11 +20,11 @@ #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/notification_service.h" -#include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc index 2819a95..7149733 100644 --- a/chrome/browser/ui/views/tab_icon_view.cc +++ b/chrome/browser/ui/views/tab_icon_view.cc @@ -12,8 +12,8 @@ #include "base/file_util.h" #include "base/logging.h" #include "chrome/app/chrome_command_ids.h" -#include "grit/app_resources.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" diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index 96ce2e3..af5e41e 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -14,10 +14,10 @@ #include "chrome/browser/ui/views/tabs/tab_controller.h" #include "chrome/common/chrome_switches.h" #include "content/browser/tab_contents/tab_contents.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/animation_container.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/tabs/side_tab.cc b/chrome/browser/ui/views/tabs/side_tab.cc index 00cc579..576728f 100644 --- a/chrome/browser/ui/views/tabs/side_tab.cc +++ b/chrome/browser/ui/views/tabs/side_tab.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/tabs/side_tab.h" #include "base/utf_string_conversions.h" -#include "grit/app_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index 9526e99..b675565 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc @@ -9,10 +9,10 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/themes/theme_service.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/animation/multi_animation.h" #include "ui/base/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc index 982117a..74b89be 100644 --- a/chrome/browser/ui/views/theme_background.cc +++ b/chrome/browser/ui/views/theme_background.cc @@ -8,10 +8,10 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "views/view.h" diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 846c5f0..e2aa160 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" FaviconSource::FaviconSource(Profile* profile, IconType type) diff --git a/chrome/browser/ui/webui/fileicon_source_cros.cc b/chrome/browser/ui/webui/fileicon_source_cros.cc index 7e6b407..62b7aa0 100644 --- a/chrome/browser/ui/webui/fileicon_source_cros.cc +++ b/chrome/browser/ui/webui/fileicon_source_cros.cc @@ -19,11 +19,11 @@ #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.h" #include "grit/component_extension_resources.h" #include "grit/component_extension_resources_map.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "net/base/mime_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 6e2f9eb..fc4f8e2 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -9,7 +9,7 @@ #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/color_analysis.h" diff --git a/chrome/browser/ui/webui/shared_resources_data_source.cc b/chrome/browser/ui/webui/shared_resources_data_source.cc index 3f883b9..fca29d2 100644 --- a/chrome/browser/ui/webui/shared_resources_data_source.cc +++ b/chrome/browser/ui/webui/shared_resources_data_source.cc @@ -12,11 +12,11 @@ #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" #include "content/browser/browser_thread.h" -#include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/shared_resources.h" #include "grit/shared_resources_map.h" #include "grit/theme_resources.h" +#include "grit/ui_resources.h" #include "net/base/mime_util.h" #include "ui/base/resource/resource_bundle.h" @@ -24,15 +24,15 @@ namespace { int PathToIDR(const std::string& path) { int idr = -1; - if (path == "app/resources/folder_closed.png") { + if (path == "ui/resources/folder_closed.png") { idr = IDR_FOLDER_CLOSED; - } else if (path == "app/resources/folder_closed_rtl.png") { + } else if (path == "ui/resources/folder_closed_rtl.png") { idr = IDR_FOLDER_CLOSED_RTL; - } else if (path == "app/resources/folder_open.png") { + } else if (path == "ui/resources/folder_open.png") { idr = IDR_FOLDER_OPEN; - } else if (path == "app/resources/folder_open_rtl.png") { + } else if (path == "ui/resources/folder_open_rtl.png") { idr = IDR_FOLDER_OPEN_RTL; - } else if (path == "app/resources/throbber.png") { + } else if (path == "ui/resources/throbber.png") { idr = IDR_THROBBER; } else { // The name of the files in the grd list are prefixed with the following diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 8c90387..2e42f4a 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1594,9 +1594,9 @@ '<(grit_out_dir)/default_plugin_resources/default_plugin_resources.pak', '<(grit_out_dir)/renderer_resources.pak', '<(grit_out_dir)/theme_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', ], diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 16d7e60..2228512 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -29,7 +29,6 @@ 'theme_resources_large', 'theme_resources_standard', 'userfeedback_proto', - '../app/app.gyp:app_resources', '../build/temp_gyp/googleurl.gyp:googleurl', '../content/content.gyp:content_browser', '../crypto/crypto.gyp:crypto', @@ -50,6 +49,7 @@ '../third_party/npapi/npapi.gyp:npapi', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/gfx/surface/surface.gyp:surface', + '../ui/ui.gyp:ui_resources', '../webkit/support/webkit_support.gyp:appcache', '../webkit/support/webkit_support.gyp:blob', '../webkit/support/webkit_support.gyp:database', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index d6fc507..806c6eb 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -114,7 +114,6 @@ 'theme_resources', 'theme_resources_standard', '../app/app.gyp:app_base', - '../app/app.gyp:app_resources', '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:base_static', @@ -131,6 +130,7 @@ '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/sqlite/sqlite.gyp:sqlite', '../third_party/zlib/zlib.gyp:zlib', + '../ui/ui.gyp:ui_resources', '../webkit/support/webkit_support.gyp:glue', ], 'sources': [ @@ -527,11 +527,11 @@ 'chrome_strings', 'common_constants_win64', 'app/policy/cloud_policy_codegen.gyp:policy_win64', - '../app/app.gyp:app_resources', '../base/base.gyp:base_nacl_win64', '../ipc/ipc.gyp:ipc_win64', '../third_party/libxml/libxml.gyp:libxml', '../ui/ui.gyp:ui_base_nacl_win64', + '../ui/ui.gyp:ui_resources', ], 'include_dirs': [ '../third_party/icu/public/i18n', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 53d6d04..3f76107 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. { @@ -111,7 +111,6 @@ # their various targets (net.gyp:net_resources, etc.), # but that causes errors in other targets when # resulting .res files get referenced multiple times. - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', @@ -120,6 +119,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', @@ -318,8 +318,8 @@ '<(grit_out_dir)/renderer_resources.pak', '<(grit_out_dir)/theme_resources.pak', '<(grit_out_dir)/theme_resources_standard.pak', - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', ], @@ -608,9 +608,9 @@ # their various targets (net.gyp:net_resources, etc.), # but that causes errors in other targets when # resulting .res files get referenced multiple times. - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', # TODO(sgk): left-over from pre-gyp build, figure out # if we still need them and/or how to update to gyp. diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index d1da145..9196093 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -558,12 +558,12 @@ '../third_party/wtl/include', ], 'dependencies': [ - '../app/app.gyp:app_resources', 'chrome.gyp:chrome_dll_version', 'chrome.gyp:installer_util_strings', '../sandbox/sandbox.gyp:sandbox', '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', + '../ui/ui.gyp:ui_resources', ], 'sources': [ '../webkit/glue/resources/aliasb.cur', @@ -583,7 +583,6 @@ # their various targets (net.gyp:net_resources, etc.), # but that causes errors in other targets when # resulting .res files get referenced multiple times. - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', @@ -592,6 +591,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', @@ -1209,7 +1209,6 @@ 'test_support_syncapi', 'test_support_unit', # 3) anything tests directly depend on - '../app/app.gyp:app_resources', '../skia/skia.gyp:skia', '../third_party/bzip2/bzip2.gyp:bzip2', '../third_party/cld/cld.gyp:cld', @@ -1218,6 +1217,7 @@ '../third_party/libjingle/libjingle.gyp:libjingle', '../third_party/libxml/libxml.gyp:libxml', '../ui/gfx/gl/gl.gyp:gl', + '../ui/ui.gyp:ui_resources', '../v8/tools/gyp/v8.gyp:v8', 'chrome_resources', 'chrome_strings', @@ -2197,7 +2197,6 @@ # their various targets (net.gyp:net_resources, etc.), # but that causes errors in other targets when # resulting .res files get referenced multiple times. - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', @@ -2206,6 +2205,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', ], @@ -2596,15 +2596,15 @@ }], ['OS=="win"', { 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', # TODO(alekseys): port sidebar to linux/mac. @@ -2730,13 +2730,13 @@ 'dependencies': [ 'chrome', 'test_support_common', - '../app/app.gyp:app_resources', '../base/base.gyp:base', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', # This is the safebrowsing test server. '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing', + '../ui/ui.gyp:ui_resources', ], 'include_dirs': [ '..', @@ -2755,15 +2755,15 @@ '../sandbox/sandbox.gyp:sandbox', ], 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', - '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', ], @@ -3434,13 +3434,13 @@ }], ['OS=="win"', { 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -3525,7 +3525,6 @@ 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_dll_version.rc.version', - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', @@ -3534,6 +3533,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', ], diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc index ae39c5f..d9afab8 100644 --- a/chrome/common/extensions/extension_action.cc +++ b/chrome/common/extensions/extension_action.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,7 +9,7 @@ #include "base/logging.h" #include "chrome/common/badge_util.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py index ffb99fb..f470f2e 100755 --- a/chrome/tools/build/repack_locales.py +++ b/chrome/tools/build/repack_locales.py @@ -62,12 +62,12 @@ def calc_inputs(locale): #e.g. '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_da.pak' inputs.append('%s/webkit/webkit_strings_%s.pak' % (SHARE_INT_DIR, locale)) - #e.g. '<(SHARED_INTERMEDIATE_DIR)/app/app_strings_da.pak', - inputs.append('%s/app/app_strings/app_strings_%s.pak' % ( + #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_strings_da.pak', + inputs.append('%s/ui/app_strings/app_strings_%s.pak' % ( SHARE_INT_DIR, locale)) - #e.g. '<(SHARED_INTERMEDIATE_DIR)/app/app_locale_settings_da.pak', - inputs.append('%s/app/app_locale_settings/app_locale_settings_%s.pak' % ( + #e.g. '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings_da.pak', + inputs.append('%s/ui/app_locale_settings/app_locale_settings_%s.pak' % ( SHARE_INT_DIR, locale)) #e.g. '<(grit_out_dir)/google_chrome_strings_da.pak' diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py index 058f57b..0b2e593 100755 --- a/chrome/tools/check_grd_for_unused_strings.py +++ b/chrome/tools/check_grd_for_unused_strings.py @@ -144,8 +144,8 @@ if __name__ == '__main__': os.path.join(chrome_dir, 'browser', 'browser_resources.grd'), os.path.join(chrome_dir, 'common', 'common_resources.grd'), os.path.join(chrome_dir, 'renderer', 'renderer_resources.grd'), - os.path.join(src_dir, 'app', 'resources', 'app_resources.grd'), os.path.join(src_dir, 'ui', 'gfx', 'gfx_resources.grd'), + os.path.join(src_dir, 'ui', 'resources', 'ui_resources.grd'), os.path.join(ui_base_dir, 'app_locale_settings.grd'), os.path.join(ui_base_dir, 'app_strings.grd'), ] diff --git a/content/content_browser.gypi b/content/content_browser.gypi index ccc0738..342722c2 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -9,7 +9,6 @@ 'type': 'static_library', 'dependencies': [ 'content_common', - '../app/app.gyp:app_resources', '../net/net.gyp:net', '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../skia/skia.gyp:skia', @@ -20,6 +19,7 @@ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/zlib/zlib.gyp:zlib', '../ui/ui.gyp:ui_base', + '../ui/ui.gyp:ui_resources', '../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_strings', ], diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids index 0b70f9f..165b0bb 100644 --- a/tools/grit/resource_ids +++ b/tools/grit/resource_ids @@ -41,7 +41,7 @@ "webkit/tools/test_shell/test_shell_resources.grd": { "includes": [5000], }, - "app/resources/app_resources.grd": { + "ui/resources/ui_resources.grd": { "includes": [5500], }, "chrome/app/theme/theme_resources.grd": { diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp index 55ef652..2fb2206 100644 --- a/ui/base/strings/ui_strings.gyp +++ b/ui/base/strings/ui_strings.gyp @@ -1,7 +1,7 @@ { 'variables': { 'chromium_code': 1, - 'grit_base_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', + 'grit_base_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui', }, 'targets': [ { @@ -70,7 +70,7 @@ { 'destination': '<(PRODUCT_DIR)/app_unittests_strings', 'files': [ - '<(grit_base_out_dir)/app_resources/app_resources.pak', + '<(grit_base_out_dir)/ui_resources/ui_resources.pak', ], }, ], diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc index cee5118..7c91b8a 100644 --- a/ui/gfx/test_suite.cc +++ b/ui/gfx/test_suite.cc @@ -44,8 +44,8 @@ void GfxTestSuite::Initialize() { pak_dir = pak_dir.AppendASCII("app_unittests_strings"); PathService::Override(ui::DIR_LOCALES, pak_dir); PathService::Override(ui::FILE_RESOURCES_PAK, - pak_dir.AppendASCII("app_resources.pak")); -#endif // OS_MACOSX + pak_dir.AppendASCII("ui_resources.pak")); +#endif // defined(OS_MACOSX) // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. diff --git a/app/resources/app_resources.grd b/ui/resources/ui_resources.grd index c95e325..95a23ed4 100644 --- a/app/resources/app_resources.grd +++ b/ui/resources/ui_resources.grd @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <grit latest_public_release="0" current_release="1"> <outputs> - <output filename="grit/app_resources.h" type="rc_header"> + <output filename="grit/ui_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="app_resources.pak" type="data_package" /> - <output filename="app_resources.rc" type="rc_all" /> + <output filename="ui_resources.pak" type="data_package" /> + <output filename="ui_resources.rc" type="rc_all" /> </outputs> <release seq="1"> <includes> @@ -52,6 +52,7 @@ 'includes': [ 'ui_base.gypi', 'ui_gfx.gypi', + 'ui_resources.gypi', ], 'conditions': [ ['toolkit_views2==1', { diff --git a/ui/ui_resources.gypi b/ui/ui_resources.gypi new file mode 100644 index 0000000..3ee5ab6 --- /dev/null +++ b/ui/ui_resources.gypi @@ -0,0 +1,31 @@ +# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +{ + 'targets': [ + { + 'target_name': 'ui_resources', + 'type': 'none', + 'variables': { + 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', + }, + 'actions': [ + { + 'action_name': 'ui_resources', + 'variables': { + 'grit_grd_file': 'resources/ui_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, + ], + 'includes': [ '../build/grit_target.gypi' ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: @@ -1,7 +1,7 @@ include_rules = [ "+app", "+grit/app_strings.h", - "+grit/app_resources.h", + "+grit/ui_resources.h", "+skia/ext", "+net", "+ui", diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 3c8bbed..89ab71a 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -6,7 +6,7 @@ #include "base/utf_string_conversions.h" #include "grit/app_strings.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/l10n/l10n_util.h" diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index bb9defc..8189afc 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" diff --git a/views/controls/menu/menu_config_gtk.cc b/views/controls/menu/menu_config_gtk.cc index 37a2b00..c55fa91 100644 --- a/views/controls/menu/menu_config_gtk.cc +++ b/views/controls/menu/menu_config_gtk.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "views/controls/menu/menu_config.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" diff --git a/views/controls/menu/menu_image_util_gtk.cc b/views/controls/menu/menu_image_util_gtk.cc index b59d666..e2e3bfb 100644 --- a/views/controls/menu/menu_image_util_gtk.cc +++ b/views/controls/menu/menu_image_util_gtk.cc @@ -5,7 +5,7 @@ #include "views/controls/menu/menu_image_util_gtk.h" #include "base/i18n/rtl.h" -#include "grit/app_resources.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_skia.h" diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc index 22e3d72..9ff9ca1 100644 --- a/views/controls/menu/menu_item_view_gtk.cc +++ b/views/controls/menu/menu_item_view_gtk.cc @@ -5,7 +5,7 @@ #include "views/controls/menu/menu_item_view.h" #include "base/utf_string_conversions.h" -#include "grit/app_resources.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_skia.h" diff --git a/views/controls/throbber.cc b/views/controls/throbber.cc index e750f0b..34f20a8 100644 --- a/views/controls/throbber.cc +++ b/views/controls/throbber.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "views/controls/throbber.h" #include "base/time.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index b71bf5f..91b9512 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/win/win_util.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/views/drag_utils.cc b/views/drag_utils.cc index 434ca3e..5c17cd1 100644 --- a/views/drag_utils.cc +++ b/views/drag_utils.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" diff --git a/views/examples/button_example.cc b/views/examples/button_example.cc index 4dcb73e..e929858 100644 --- a/views/examples/button_example.cc +++ b/views/examples/button_example.cc @@ -4,7 +4,7 @@ #include "views/examples/button_example.h" -#include "grit/app_resources.h" +#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/checkbox.h" #include "views/layout/fill_layout.h" diff --git a/views/views.gyp b/views/views.gyp index 73a8fcd..7ac9d79 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -61,7 +61,6 @@ 'target_name': 'views', 'type': 'static_library', 'dependencies': [ - '../app/app.gyp:app_resources', '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../build/temp_gyp/googleurl.gyp:googleurl', @@ -71,6 +70,7 @@ '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/gfx/compositor/compositor.gyp:compositor', '../ui/ui.gyp:ui_base', + '../ui/ui.gyp:ui_resources', ], 'sources': [ # All .cc, .h under views, except unittests @@ -471,7 +471,6 @@ 'target_name': 'views_unittests', 'type': 'executable', 'dependencies': [ - '../app/app.gyp:app_resources', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', @@ -480,6 +479,7 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/ui.gyp:ui_resources', 'views', ], 'include_dirs': [ @@ -516,7 +516,7 @@ 'widget/native_widget_unittest.cc', 'widget/native_widget_win_unittest.cc', - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { @@ -564,13 +564,13 @@ 'target_name': 'views_examples', 'type': 'executable', 'dependencies': [ - '../app/app.gyp:app_resources', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../ui/ui.gyp:ui_gfx', '../ui/ui.gyp:gfx_resources', + '../ui/ui.gyp:ui_resources', 'views', ], 'include_dirs': [ @@ -615,8 +615,8 @@ 'examples/widget_example.h', 'test/test_views_delegate.cc', 'test/test_views_delegate.h', - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { @@ -654,14 +654,14 @@ 'target_name': 'views_desktop_lib', 'type': 'static_library', 'dependencies': [ - '../app/app.gyp:app_resources', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', - 'views', - '../ui/ui.gyp:ui_gfx', '../ui/ui.gyp:gfx_resources', + '../ui/ui.gyp:ui_gfx', + '../ui/ui.gyp:ui_resources', + 'views', ], 'include_dirs': [ '..', @@ -700,21 +700,21 @@ '<(DEPTH)/third_party/wtl/include', ], }], - ], + ], }, { 'target_name': 'views_desktop', 'type': 'executable', 'dependencies': [ - '../app/app.gyp:app_resources', '../base/base.gyp:base', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/ui.gyp:gfx_resources', + '../ui/ui.gyp:ui_gfx', + '../ui/ui.gyp:ui_resources', 'views', 'views_desktop_lib', - '../ui/ui.gyp:ui_gfx', - '../ui/ui.gyp:gfx_resources', ], 'include_dirs': [ '..', @@ -723,8 +723,8 @@ 'desktop/desktop_main.cc', 'desktop/desktop_views_delegate.cc', 'desktop/desktop_views_delegate.h', - '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', ], 'conditions': [ ['toolkit_uses_gtk == 1', { diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index ff59913..8de6072 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -5,8 +5,8 @@ #include "views/window/custom_frame_view.h" #include "base/utf_string_conversions.h" -#include "grit/app_resources.h" #include "grit/app_strings.h" +#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" diff --git a/views/window/window_shape.h b/views/window/window_shape.h index 0fadc87..e65bc2b 100644 --- a/views/window/window_shape.h +++ b/views/window/window_shape.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,9 +14,9 @@ class Path; namespace views { // Sets the window mask to a style that most likely matches -// app/resources/window_* +// ui/resources/window_* void GetDefaultWindowMask(const gfx::Size& size, gfx::Path* window_mask); } // namespace views -#endif // #ifndef VIEWS_WINDOW_WINDOW_SHAPE_H_ +#endif // VIEWS_WINDOW_WINDOW_SHAPE_H_ |
