Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5008)

Unified Diff: chrome/browser/resources_util.cc

Issue 417493002: Make ui_chromeos_resources IDRs accessible via chrome://theme/<IDR>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: +test Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources_util.cc
diff --git a/chrome/browser/resources_util.cc b/chrome/browser/resources_util.cc
index ef6c888c98be9392a115e44ba29636a8b0191f0b..d2a593d17add3aeb3be7980ab7b80c51ceb3bc85 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) {
« no previous file with comments | « no previous file | chrome/browser/resources_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698