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

Side by Side Diff: chrome/browser/resources_util.cc

Issue 11830002: Make ui_resources IDRs accessible via chrome://theme/<IDR>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comment. Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources_util_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/resources_util.h" 5 #include "chrome/browser/resources_util.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/hash_tables.h" 9 #include "base/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
11 #include "grit/theme_resources_map.h" 11 #include "grit/theme_resources_map.h"
12 #include "grit/ui_resources_map.h"
12 13
13 namespace { 14 namespace {
14 15
15 // A wrapper class that holds a hash_map between resource strings and resource 16 // A wrapper class that holds a hash_map between resource strings and resource
16 // ids. This is done so we can use base::LazyInstance which takes care of 17 // ids. This is done so we can use base::LazyInstance which takes care of
17 // thread safety in initializing the hash_map for us. 18 // thread safety in initializing the hash_map for us.
18 class ThemeMap { 19 class ThemeMap {
19 public: 20 public:
20 typedef base::hash_map<std::string, int> StringIntMap; 21 typedef base::hash_map<std::string, int> StringIntMap;
21 22
22 ThemeMap() { 23 ThemeMap() {
23 for (size_t i = 0; i < kThemeResourcesSize; ++i) 24 for (size_t i = 0; i < kThemeResourcesSize; ++i)
24 id_map_[kThemeResources[i].name] = kThemeResources[i].value; 25 id_map_[kThemeResources[i].name] = kThemeResources[i].value;
26 for (size_t i = 0; i < kUiResourcesSize; ++i)
27 id_map_[kUiResources[i].name] = kUiResources[i].value;
25 } 28 }
26 29
27 int GetId(const std::string& resource_name) { 30 int GetId(const std::string& resource_name) {
28 StringIntMap::const_iterator it = id_map_.find(resource_name); 31 StringIntMap::const_iterator it = id_map_.find(resource_name);
29 if (it == id_map_.end()) 32 if (it == id_map_.end())
30 return -1; 33 return -1;
31 return it->second; 34 return it->second;
32 } 35 }
33 36
34 private: 37 private:
35 StringIntMap id_map_; 38 StringIntMap id_map_;
36 }; 39 };
37 40
38 static base::LazyInstance<ThemeMap> g_theme_ids = LAZY_INSTANCE_INITIALIZER; 41 static base::LazyInstance<ThemeMap> g_theme_ids = LAZY_INSTANCE_INITIALIZER;
39 42
40 } // namespace 43 } // namespace
41 44
42 int ResourcesUtil::GetThemeResourceId(const std::string& resource_name) { 45 int ResourcesUtil::GetThemeResourceId(const std::string& resource_name) {
43 return g_theme_ids.Get().GetId(resource_name); 46 return g_theme_ids.Get().GetId(resource_name);
44 } 47 }
OLDNEW
« 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