First cut at adding a map between strings names and resource ids.

This creates a mapping for all the entries in the
theme_resources.grd file and adds a static method for querying
the mapping.

BUG=10639

Review URL: http://codereview.chromium.org/92085


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14443 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 129 insertions, 0 deletions

diff --git a/chrome/app/chrome_resources.vcproj b/chrome/app/chrome_resources.vcproj
index 96efc65..1bf8a6f 100644
--- a/chrome/app/chrome_resources.vcproj
+++ b/chrome/app/chrome_resources.vcproj
@@ -86,6 +86,10 @@
 				>
 			</File>
 			<File
+				RelativePath="$(OutDir)\grit_derived_sources\grit\theme_resources_map.h"
+				>
+		</File>
+			<File
 				RelativePath="$(OutDir)\grit_derived_sources\grit\theme_resources.h"
 				>
 			</File>
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index 4967888..deff5fc 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -6,6 +6,8 @@
     </output>
     <output filename="theme_resources.rc" type="rc_all" />
     <output filename="theme_resources.pak" type="data_package" />
+    <output filename="grit/theme_resources_map.h" type="resource_map_header" />
+    <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
   </outputs>
   <release seq="1">
     <includes>
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 854355d..b41bf15 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -2603,6 +2603,18 @@
 			>
 		</File>
 		<File
+			RelativePath="$(OutDir)\grit_derived_sources\grit\theme_resources_map.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\theme_resources_util.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\theme_resources_util.h"
+			>
+		</File>
+		<File
 			RelativePath=".\toolbar_model.cc"
 			>
 		</File>
diff --git a/chrome/browser/theme_resources_util.cc b/chrome/browser/theme_resources_util.cc
new file mode 100644
index 0000000..2358f6f
--- /dev/null
+++ b/chrome/browser/theme_resources_util.cc
@@ -0,0 +1,46 @@
+// Copyright (c) 2009 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 "chrome/browser/theme_resources_util.h"
+
+#include "base/hash_tables.h"
+#include "base/lazy_instance.h"
+#include "base/logging.h"
+#include "grit/theme_resources_map.h"
+
+#include <utility>
+
+namespace {
+
+// A wrapper class that holds a hash_map between resource strings and resource
+// ids.  This is done so we can use base::LazyInstance which takes care of
+// thread safety in initializing the hash_map for us.
+class ThemeMap {
+ public:
+  typedef base::hash_map<std::string, int> StringIntMap;
+
+  ThemeMap() {
+    for (size_t i = 0; i < kThemeResourcesSize; ++i) {
+      id_map_[kThemeResources[i].name] = kThemeResources[i].value;
+    }
+  }
+
+  int GetId(const std::string& resource_name) {
+    StringIntMap::const_iterator it = id_map_.find(resource_name);
+    if (it == id_map_.end())
+      return -1;
+    return it->second;
+  }
+
+ private:
+  StringIntMap id_map_;
+};
+
+static base::LazyInstance<ThemeMap> g_theme_ids(base::LINKER_INITIALIZED);
+
+}  // namespace
+
+int ThemeResourcesUtil::GetId(const std::string& resource_name) {
+  return g_theme_ids.Get().GetId(resource_name);
+}
diff --git a/chrome/browser/theme_resources_util.h b/chrome/browser/theme_resources_util.h
new file mode 100644
index 0000000..6509a50
--- /dev/null
+++ b/chrome/browser/theme_resources_util.h
@@ -0,0 +1,22 @@
+// Copyright (c) 2009 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.
+
+#ifndef CHROME_BROWSER_THEME_RESOURCES_UTIL_H_
+#define CHROME_BROWSER_THEME_RESOURCES_UTIL_H_
+
+#include <string>
+
+#include "base/basictypes.h"
+
+class ThemeResourcesUtil {
+ public:
+  // Returns the theme resource id or -1 if no resource with the name exists.
+  static int GetId(const std::string& resource_name);
+
+ private:
+  ThemeResourcesUtil() {}
+  DISALLOW_COPY_AND_ASSIGN(ThemeResourcesUtil);
+};
+
+#endif  // CHROME_BROWSER_THEME_RESOURCES_UTIL_H_
diff --git a/chrome/browser/theme_resources_util_unittest.cc b/chrome/browser/theme_resources_util_unittest.cc
new file mode 100644
index 0000000..4bd6bd0
--- /dev/null
+++ b/chrome/browser/theme_resources_util_unittest.cc
@@ -0,0 +1,33 @@
+// Copyright (c) 2009 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 "chrome/browser/theme_resources_util.h"
+
+#include "grit/theme_resources.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+struct TestCase {
+  const char* name;
+  int id;
+};
+
+}  // namespace
+
+TEST(ThemeResourcesUtil, SpotCheckIds) {
+  const TestCase kTestCases[] = {
+    {"back", IDR_BACK},
+    {"go", IDR_GO},
+    {"star", IDR_STAR},
+    {"sad_tab", IDR_SAD_TAB},
+  };
+  for (size_t i = 0; i < arraysize(kTestCases); ++i) {
+    EXPECT_EQ(kTestCases[i].id, ThemeResourcesUtil::GetId(kTestCases[i].name));
+  }
+
+  // Should return -1 of unknown names.
+  EXPECT_EQ(-1, ThemeResourcesUtil::GetId("foobar"));
+  EXPECT_EQ(-1, ThemeResourcesUtil::GetId("backstar"));
+}
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index cd3bc0d..eebd53c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1122,6 +1122,8 @@
         'browser/task_manager.h',
         'browser/task_manager_resource_providers.cc',
         'browser/task_manager_resource_providers.h',
+        'browser/theme_resources_util.cc',
+        'browser/theme_resources_util.h',
         'browser/toolbar_model.cc',
         'browser/toolbar_model.h',
         'browser/user_data_manager.cc',
@@ -1306,6 +1308,9 @@
         'browser/worker_host/worker_process_host.h',
         'browser/worker_host/worker_service.cc',
         'browser/worker_host/worker_service.h',
+
+        # This file is generated by GRIT.
+        '<(SHARED_INTERMEDIATE_DIR)/chrome/grit/theme_resources_map.cc',
       ],
       'conditions': [
         ['javascript_engine=="v8"', {
@@ -2250,6 +2255,7 @@
         'browser/tab_contents/render_view_host_manager_unittest.cc',
         'browser/tab_contents/web_contents_unittest.cc',
         'browser/tabs/tab_strip_model_unittest.cc',
+        'browser/theme_resources_util_unittest.cc',
         'browser/views/bookmark_editor_view_unittest.cc',
         'browser/views/find_bar_win_unittest.cc',
         'browser/views/keyword_editor_view_unittest.cc',
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 8900642..85ca286 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -760,6 +760,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\browser\theme_resources_util_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\browser\history\thumbnail_database_unittest.cc"
 				>
 			</File>