diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 09:19:26 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 09:19:26 +0000 |
| commit | cdd7bb8c3c5ed76e5e229cec335605282220d0d6 (patch) | |
| tree | 07ccc2fc8da18121abecfc3b4c77eeeea872608d | |
| parent | 10befff7b9601cee270ed32138bb10e4af648a3d (diff) | |
| download | chromium_src-cdd7bb8c3c5ed76e5e229cec335605282220d0d6.zip chromium_src-cdd7bb8c3c5ed76e5e229cec335605282220d0d6.tar.gz chromium_src-cdd7bb8c3c5ed76e5e229cec335605282220d0d6.tar.bz2 | |
Make ui_chromeos_resources IDRs accessible via chrome://theme/<IDR>.
Same what https://chromiumcodereview.appspot.com/11830002 did for ui_resources.
BUG=396209
Review URL: https://codereview.chromium.org/417493002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285540 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources_util.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/resources_util_unittest.cc | 8 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 1 | ||||
| -rw-r--r-- | ui/chromeos/resources/ui_chromeos_resources.grd | 2 |
5 files changed, 26 insertions, 1 deletions
diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc index ef6c888..d2a593d 100644 --- a/chrome/browser/resources_util.cc +++ b/chrome/browser/resources_util.cc @@ -11,6 +11,10 @@ #include "grit/theme_resources_map.h" #include "grit/ui_resources_map.h" +#if defined(OS_CHROMEOS) +#include "grit/ui_chromeos_resources_map.h" +#endif + namespace { // A wrapper class that holds a hash_map between resource strings and resource @@ -25,6 +29,10 @@ class ThemeMap { id_map_[kThemeResources[i].name] = kThemeResources[i].value; for (size_t i = 0; i < kUiResourcesSize; ++i) id_map_[kUiResources[i].name] = kUiResources[i].value; +#if defined(OS_CHROMEOS) + for (size_t i = 0; i < kUiChromeosResourcesSize; ++i) + id_map_[kUiChromeosResources[i].name] = kUiChromeosResources[i].value; +#endif } int GetId(const std::string& resource_name) { diff --git a/chrome/browser/resources_util_unittest.cc b/chrome/browser/resources_util_unittest.cc index 7637559..ec52eef 100644 --- a/chrome/browser/resources_util_unittest.cc +++ b/chrome/browser/resources_util_unittest.cc @@ -8,6 +8,10 @@ #include "grit/ui_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#if defined(OS_CHROMEOS) +#include "grit/ui_chromeos_resources.h" +#endif + TEST(ResourcesUtil, SpotCheckIds) { const struct { const char* name; @@ -19,6 +23,10 @@ TEST(ResourcesUtil, SpotCheckIds) { // IDRs from ui/resources/ui_resources.grd should be valid. {"IDR_CHECKMARK", IDR_CHECKMARK}, {"IDR_THROBBER", IDR_THROBBER}, +#if defined(OS_CHROMEOS) + // Check IDRs from ui/chromeos/resources/ui_chromeos_resources.grd. + {"IDR_LOGIN_DEFAULT_USER", IDR_LOGIN_DEFAULT_USER}, +#endif // Unknown names should be invalid and return -1. {"foobar", -1}, {"backstar", -1}, diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 35f9994..8e84075 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3173,9 +3173,15 @@ ], }], ['chromeos==1', { - 'sources': [ '<@(chrome_browser_chromeos_sources)' ], + 'sources': [ + '<@(chrome_browser_chromeos_sources)', + + # This file is generated by GRIT. + '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/grit/ui_chromeos_resources_map.cc', + ], 'dependencies': [ 'browser_chromeos', + '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', ], }, { # Non-ChromeOS. 'sources': [ '<@(chrome_browser_non_chromeos_sources)' ], diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index cbb071d..6cbf1d4 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2344,6 +2344,7 @@ ['chromeos==1', { 'dependencies': [ '../ash/ash_resources.gyp:ash_resources', + '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', ], 'sources!': [ 'browser/extensions/api/messaging/native_message_process_host_unittest.cc', diff --git a/ui/chromeos/resources/ui_chromeos_resources.grd b/ui/chromeos/resources/ui_chromeos_resources.grd index d19d9f4..c7744e6 100644 --- a/ui/chromeos/resources/ui_chromeos_resources.grd +++ b/ui/chromeos/resources/ui_chromeos_resources.grd @@ -4,6 +4,8 @@ <output filename="grit/ui_chromeos_resources.h" type="rc_header" context="default_100_percent"> <emit emit_type='prepend'></emit> </output> + <output filename="grit/ui_chromeos_resources_map.cc" type="resource_map_source" context="default_100_percent" /> + <output filename="grit/ui_chromeos_resources_map.h" type="resource_map_header" context="default_100_percent" /> <output filename="ui_chromeos_resources_100_percent.pak" type="data_package" context="default_100_percent" /> <output filename="ui_chromeos_resources_200_percent.pak" type="data_package" context="default_200_percent" /> </outputs> |