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

Unified Diff: chrome/browser/resources_util.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, *_standard.rc Created 8 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 | « chrome/browser/protector/session_startup_change.cc ('k') | 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 a406b4d2b1486d80ef60d6c03a3fa87546f0b171..0669f61f344ab30f07b83fac788921d73f2bf873 100644
--- a/chrome/browser/resources_util.cc
+++ b/chrome/browser/resources_util.cc
@@ -9,7 +9,6 @@
#include "base/hash_tables.h"
#include "base/lazy_instance.h"
#include "grit/theme_resources_map.h"
-#include "grit/theme_resources_standard_map.h"
namespace {
@@ -21,13 +20,8 @@ class ThemeMap {
typedef base::hash_map<std::string, int> StringIntMap;
ThemeMap() {
- for (size_t i = 0; i < kThemeResourcesSize; ++i) {
+ for (size_t i = 0; i < kThemeResourcesSize; ++i)
id_map_[kThemeResources[i].name] = kThemeResources[i].value;
- }
- for (size_t i = 0; i < kThemeResourcesStandardSize; ++i) {
- id_map_[kThemeResourcesStandard[i].name] =
- kThemeResourcesStandard[i].value;
- }
}
int GetId(const std::string& resource_name) {
« no previous file with comments | « chrome/browser/protector/session_startup_change.cc ('k') | chrome/browser/resources_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698