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

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

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/mac_util.h" 5 #include "components/policy/core/common/mac_util.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/mac/foundation_util.h" 10 #include "base/mac/foundation_util.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 } else { 64 } else {
65 int int_value = 0; 65 int int_value = 0;
66 if (CFNumberGetValue(number, kCFNumberIntType, &int_value)) { 66 if (CFNumberGetValue(number, kCFNumberIntType, &int_value)) {
67 return std::unique_ptr<base::Value>(new base::Value(int_value)); 67 return std::unique_ptr<base::Value>(new base::Value(int_value));
68 } 68 }
69 } 69 }
70 } 70 }
71 71
72 if (CFStringRef string = CFCast<CFStringRef>(property)) { 72 if (CFStringRef string = CFCast<CFStringRef>(property)) {
73 return std::unique_ptr<base::Value>( 73 return std::unique_ptr<base::Value>(
74 new base::StringValue(base::SysCFStringRefToUTF8(string))); 74 new base::Value(base::SysCFStringRefToUTF8(string)));
75 } 75 }
76 76
77 if (CFDictionaryRef dict = CFCast<CFDictionaryRef>(property)) { 77 if (CFDictionaryRef dict = CFCast<CFDictionaryRef>(property)) {
78 std::unique_ptr<base::DictionaryValue> dict_value( 78 std::unique_ptr<base::DictionaryValue> dict_value(
79 new base::DictionaryValue()); 79 new base::DictionaryValue());
80 CFDictionaryApplyFunction(dict, DictionaryEntryToValue, dict_value.get()); 80 CFDictionaryApplyFunction(dict, DictionaryEntryToValue, dict_value.get());
81 return std::move(dict_value); 81 return std::move(dict_value);
82 } 82 }
83 83
84 if (CFArrayRef array = CFCast<CFArrayRef>(property)) { 84 if (CFArrayRef array = CFCast<CFArrayRef>(property)) {
85 std::unique_ptr<base::ListValue> list_value(new base::ListValue()); 85 std::unique_ptr<base::ListValue> list_value(new base::ListValue());
86 CFArrayApplyFunction(array, 86 CFArrayApplyFunction(array,
87 CFRangeMake(0, CFArrayGetCount(array)), 87 CFRangeMake(0, CFArrayGetCount(array)),
88 ArrayEntryToValue, 88 ArrayEntryToValue,
89 list_value.get()); 89 list_value.get());
90 return std::move(list_value); 90 return std::move(list_value);
91 } 91 }
92 92
93 return nullptr; 93 return nullptr;
94 } 94 }
95 95
96 } // namespace policy 96 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698