| Index: ash/display/display_pref_util.h
|
| diff --git a/ash/display/display_pref_util.h b/ash/display/display_pref_util.h
|
| index 5047774c479356fd7c901ce3c2877556da47a869..aae59a958947c2034aa6fef18fa335970d177425 100644
|
| --- a/ash/display/display_pref_util.h
|
| +++ b/ash/display/display_pref_util.h
|
| @@ -14,11 +14,15 @@ namespace ash {
|
|
|
| // Utility templates to create enum to string map and
|
| // a function to find an enum value from a string.
|
| -template<typename T>
|
| -std::map<T, std::string>* CreateToStringMap(T k1, const std::string& v1,
|
| - T k2, const std::string& v2,
|
| - T k3, const std::string& v3,
|
| - T k4, const std::string& v4) {
|
| +template <typename T>
|
| +std::map<T, std::string>* CreateToStringMap(T k1,
|
| + const std::string& v1,
|
| + T k2,
|
| + const std::string& v2,
|
| + T k3,
|
| + const std::string& v3,
|
| + T k4,
|
| + const std::string& v4) {
|
| std::map<T, std::string>* map = new std::map<T, std::string>();
|
| (*map)[k1] = v1;
|
| (*map)[k2] = v2;
|
| @@ -27,10 +31,13 @@ std::map<T, std::string>* CreateToStringMap(T k1, const std::string& v1,
|
| return map;
|
| }
|
|
|
| -template<typename T>
|
| -std::map<T, std::string>* CreateToStringMap(T k1, const std::string& v1,
|
| - T k2, const std::string& v2,
|
| - T k3, const std::string& v3) {
|
| +template <typename T>
|
| +std::map<T, std::string>* CreateToStringMap(T k1,
|
| + const std::string& v1,
|
| + T k2,
|
| + const std::string& v2,
|
| + T k3,
|
| + const std::string& v3) {
|
| std::map<T, std::string>* map = new std::map<T, std::string>();
|
| (*map)[k1] = v1;
|
| (*map)[k2] = v2;
|
| @@ -38,14 +45,12 @@ std::map<T, std::string>* CreateToStringMap(T k1, const std::string& v1,
|
| return map;
|
| }
|
|
|
| -template<typename T>
|
| +template <typename T>
|
| bool ReverseFind(const std::map<T, std::string>* map,
|
| const base::StringPiece& value,
|
| T* key) {
|
| typename std::map<T, std::string>::const_iterator iter = map->begin();
|
| - for (;
|
| - iter != map->end();
|
| - ++iter) {
|
| + for (; iter != map->end(); ++iter) {
|
| if (iter->second == value) {
|
| *key = iter->first;
|
| return true;
|
|
|