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

Side by Side Diff: components/policy/core/common/registry_dict_win.cc

Issue 383263005: Remove more CreateIntegerValue calls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/SetBoolean/SetInteger Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "components/policy/core/common/registry_dict_win.h" 5 #include "components/policy/core/common/registry_dict_win.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 base::StringToInt(string_value, &int_value))) { 72 base::StringToInt(string_value, &int_value))) {
73 return scoped_ptr<base::Value>( 73 return scoped_ptr<base::Value>(
74 base::Value::CreateBooleanValue(int_value != 0)); 74 base::Value::CreateBooleanValue(int_value != 0));
75 } 75 }
76 break; 76 break;
77 } 77 }
78 case base::Value::TYPE_INTEGER: { 78 case base::Value::TYPE_INTEGER: {
79 // Integers may be string-encoded. 79 // Integers may be string-encoded.
80 if (value.GetAsString(&string_value) && 80 if (value.GetAsString(&string_value) &&
81 base::StringToInt(string_value, &int_value)) { 81 base::StringToInt(string_value, &int_value)) {
82 return scoped_ptr<base::Value>( 82 return scoped_ptr<base::Value>(new base::FundamentalValue(int_value));
83 base::Value::CreateIntegerValue(int_value));
84 } 83 }
85 break; 84 break;
86 } 85 }
87 case base::Value::TYPE_DOUBLE: { 86 case base::Value::TYPE_DOUBLE: {
88 // Doubles may be string-encoded or integer-encoded. 87 // Doubles may be string-encoded or integer-encoded.
89 double double_value = 0; 88 double double_value = 0;
90 if (value.GetAsInteger(&int_value)) { 89 if (value.GetAsInteger(&int_value)) {
91 return scoped_ptr<base::Value>( 90 return scoped_ptr<base::Value>(
92 base::Value::CreateDoubleValue(int_value)); 91 base::Value::CreateDoubleValue(int_value));
93 } else if (value.GetAsString(&string_value) && 92 } else if (value.GetAsString(&string_value) &&
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 continue; 256 continue;
258 case REG_DWORD_LITTLE_ENDIAN: 257 case REG_DWORD_LITTLE_ENDIAN:
259 case REG_DWORD_BIG_ENDIAN: 258 case REG_DWORD_BIG_ENDIAN:
260 if (it.ValueSize() == sizeof(DWORD)) { 259 if (it.ValueSize() == sizeof(DWORD)) {
261 DWORD dword_value = *(reinterpret_cast<const DWORD*>(it.Value())); 260 DWORD dword_value = *(reinterpret_cast<const DWORD*>(it.Value()));
262 if (it.Type() == REG_DWORD_BIG_ENDIAN) 261 if (it.Type() == REG_DWORD_BIG_ENDIAN)
263 dword_value = base::NetToHost32(dword_value); 262 dword_value = base::NetToHost32(dword_value);
264 else 263 else
265 dword_value = base::ByteSwapToLE32(dword_value); 264 dword_value = base::ByteSwapToLE32(dword_value);
266 SetValue(name, 265 SetValue(name,
267 scoped_ptr<base::Value>( 266 scoped_ptr<base::Value>(new base::FundamentalValue(
268 base::Value::CreateIntegerValue(dword_value))); 267 static_cast<int>(dword_value))));
269 continue; 268 continue;
270 } 269 }
271 case REG_NONE: 270 case REG_NONE:
272 case REG_LINK: 271 case REG_LINK:
273 case REG_MULTI_SZ: 272 case REG_MULTI_SZ:
274 case REG_RESOURCE_LIST: 273 case REG_RESOURCE_LIST:
275 case REG_FULL_RESOURCE_DESCRIPTOR: 274 case REG_FULL_RESOURCE_DESCRIPTOR:
276 case REG_RESOURCE_REQUIREMENTS_LIST: 275 case REG_RESOURCE_REQUIREMENTS_LIST:
277 case REG_QWORD_LITTLE_ENDIAN: 276 case REG_QWORD_LITTLE_ENDIAN:
278 // Unsupported type, message gets logged below. 277 // Unsupported type, message gets logged below.
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 return result.PassAs<base::Value>(); 343 return result.PassAs<base::Value>();
345 } 344 }
346 default: 345 default:
347 LOG(WARNING) << "Can't convert registry key to schema type " << type; 346 LOG(WARNING) << "Can't convert registry key to schema type " << type;
348 } 347 }
349 348
350 return scoped_ptr<base::Value>(); 349 return scoped_ptr<base::Value>();
351 } 350 }
352 351
353 } // namespace policy 352 } // namespace policy
OLDNEW
« no previous file with comments | « components/policy/core/common/preg_parser_win.cc ('k') | components/policy/core/common/schema_map_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698