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

Side by Side Diff: components/search_engines/template_url_data_util.cc

Issue 2816513002: Revert of Change base::Value::ListStorage to std::vector<base::Value> (Closed)
Patch Set: Created 3 years, 8 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/search_engines/template_url_data_util.h" 5 #include "components/search_engines/template_url_data_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 int64_t last_visited = 0; 83 int64_t last_visited = 0;
84 if (base::StringToInt64(last_visited_str, &last_visited)) 84 if (base::StringToInt64(last_visited_str, &last_visited))
85 result->last_visited = base::Time::FromInternalValue(last_visited); 85 result->last_visited = base::Time::FromInternalValue(last_visited);
86 86
87 dict.GetInteger(DefaultSearchManager::kUsageCount, &result->usage_count); 87 dict.GetInteger(DefaultSearchManager::kUsageCount, &result->usage_count);
88 88
89 const base::ListValue* alternate_urls = nullptr; 89 const base::ListValue* alternate_urls = nullptr;
90 if (dict.GetList(DefaultSearchManager::kAlternateURLs, &alternate_urls)) { 90 if (dict.GetList(DefaultSearchManager::kAlternateURLs, &alternate_urls)) {
91 for (const auto& it : *alternate_urls) { 91 for (const auto& it : *alternate_urls) {
92 std::string alternate_url; 92 std::string alternate_url;
93 if (it.GetAsString(&alternate_url)) 93 if (it->GetAsString(&alternate_url))
94 result->alternate_urls.push_back(std::move(alternate_url)); 94 result->alternate_urls.push_back(std::move(alternate_url));
95 } 95 }
96 } 96 }
97 97
98 const base::ListValue* encodings = nullptr; 98 const base::ListValue* encodings = nullptr;
99 if (dict.GetList(DefaultSearchManager::kInputEncodings, &encodings)) { 99 if (dict.GetList(DefaultSearchManager::kInputEncodings, &encodings)) {
100 for (const auto& it : *encodings) { 100 for (const auto& it : *encodings) {
101 std::string encoding; 101 std::string encoding;
102 if (it.GetAsString(&encoding)) 102 if (it->GetAsString(&encoding))
103 result->input_encodings.push_back(std::move(encoding)); 103 result->input_encodings.push_back(std::move(encoding));
104 } 104 }
105 } 105 }
106 106
107 dict.GetString(DefaultSearchManager::kSearchTermsReplacementKey, 107 dict.GetString(DefaultSearchManager::kSearchTermsReplacementKey,
108 &result->search_terms_replacement_key); 108 &result->search_terms_replacement_key);
109 dict.GetBoolean(DefaultSearchManager::kCreatedByPolicy, 109 dict.GetBoolean(DefaultSearchManager::kCreatedByPolicy,
110 &result->created_by_policy); 110 &result->created_by_policy);
111 return result; 111 return result;
112 } 112 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 &search_terms_replacement_key); 235 &search_terms_replacement_key);
236 return base::MakeUnique<TemplateURLData>( 236 return base::MakeUnique<TemplateURLData>(
237 name, keyword, search_url, suggest_url, instant_url, image_url, 237 name, keyword, search_url, suggest_url, instant_url, image_url,
238 new_tab_url, contextual_search_url, search_url_post_params, 238 new_tab_url, contextual_search_url, search_url_post_params,
239 suggest_url_post_params, instant_url_post_params, image_url_post_params, 239 suggest_url_post_params, instant_url_post_params, image_url_post_params,
240 favicon_url, encoding, *alternate_urls, search_terms_replacement_key, 240 favicon_url, encoding, *alternate_urls, search_terms_replacement_key,
241 id); 241 id);
242 } 242 }
243 return std::unique_ptr<TemplateURLData>(); 243 return std::unique_ptr<TemplateURLData>();
244 } 244 }
OLDNEW
« no previous file with comments | « components/prefs/pref_member.cc ('k') | components/signin/core/browser/account_tracker_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698