Merge grd files in ui/resources and chrome/app/theme

chrome/browser/resources_util.cc

 // Copyright (c) 2011 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/resources_util.h"
 
 #include <utility>
 
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "grit/theme_resources_map.h"
-#include "grit/theme_resources_standard_map.h"
 
 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;
     }

[oshima, 2012/07/10 15:11:23]

nuke {}

[benrg, 2012/07/10 22:56:48]

Done.

-    for (size_t i = 0; i < kThemeResourcesStandardSize; ++i) {
-      id_map_[kThemeResourcesStandard[i].name] =
-          kThemeResourcesStandard[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 = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 int ResourcesUtil::GetThemeResourceId(const std::string& resource_name) {
   return g_theme_ids.Get().GetId(resource_name);
 }