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

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

Issue 1129083003: More base::Values-related bare pointer -> scoped_ptr conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad merge Created 5 years, 7 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 return result.Pass(); 56 return result.Pass();
57 } 57 }
58 return make_scoped_ptr(value.DeepCopy()); 58 return make_scoped_ptr(value.DeepCopy());
59 } 59 }
60 60
61 // Else, do some conversions to map windows registry data types to JSON types. 61 // Else, do some conversions to map windows registry data types to JSON types.
62 std::string string_value; 62 std::string string_value;
63 int int_value = 0; 63 int int_value = 0;
64 switch (schema.type()) { 64 switch (schema.type()) {
65 case base::Value::TYPE_NULL: { 65 case base::Value::TYPE_NULL: {
66 return make_scoped_ptr(base::Value::CreateNullValue()).Pass(); 66 return base::Value::CreateNullValue();
67 } 67 }
68 case base::Value::TYPE_BOOLEAN: { 68 case base::Value::TYPE_BOOLEAN: {
69 // Accept booleans encoded as either string or integer. 69 // Accept booleans encoded as either string or integer.
70 if (value.GetAsInteger(&int_value) || 70 if (value.GetAsInteger(&int_value) ||
71 (value.GetAsString(&string_value) && 71 (value.GetAsString(&string_value) &&
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 new base::FundamentalValue(int_value != 0)); 74 new base::FundamentalValue(int_value != 0));
75 } 75 }
76 break; 76 break;
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 return result.Pass(); 341 return result.Pass();
342 } 342 }
343 default: 343 default:
344 LOG(WARNING) << "Can't convert registry key to schema type " << type; 344 LOG(WARNING) << "Can't convert registry key to schema type " << type;
345 } 345 }
346 346
347 return nullptr; 347 return nullptr;
348 } 348 }
349 349
350 } // namespace policy 350 } // namespace policy
OLDNEW
« no previous file with comments | « components/policy/core/common/mac_util.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