OLD | NEW |
---|---|
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
60 &result->suggestions_url_post_params); | 60 &result->suggestions_url_post_params); |
61 dict.GetString(DefaultSearchManager::kInstantURLPostParams, | 61 dict.GetString(DefaultSearchManager::kInstantURLPostParams, |
62 &result->instant_url_post_params); | 62 &result->instant_url_post_params); |
63 dict.GetString(DefaultSearchManager::kImageURLPostParams, | 63 dict.GetString(DefaultSearchManager::kImageURLPostParams, |
64 &result->image_url_post_params); | 64 &result->image_url_post_params); |
65 dict.GetBoolean(DefaultSearchManager::kSafeForAutoReplace, | 65 dict.GetBoolean(DefaultSearchManager::kSafeForAutoReplace, |
66 &result->safe_for_autoreplace); | 66 &result->safe_for_autoreplace); |
67 | 67 |
68 std::string date_created_str; | 68 std::string date_created_str; |
69 std::string last_modified_str; | 69 std::string last_modified_str; |
70 std::string last_visited_str; | |
70 dict.GetString(DefaultSearchManager::kDateCreated, &date_created_str); | 71 dict.GetString(DefaultSearchManager::kDateCreated, &date_created_str); |
71 dict.GetString(DefaultSearchManager::kLastModified, &last_modified_str); | 72 dict.GetString(DefaultSearchManager::kLastModified, &last_modified_str); |
73 dict.GetString(DefaultSearchManager::kLastVisited, &last_visited_str); | |
72 | 74 |
73 int64_t date_created = 0; | 75 int64_t date_created = 0; |
74 if (base::StringToInt64(date_created_str, &date_created)) { | 76 if (base::StringToInt64(date_created_str, &date_created)) { |
75 result->date_created = base::Time::FromInternalValue(date_created); | 77 result->date_created = base::Time::FromInternalValue(date_created); |
76 } | 78 } |
77 | 79 |
78 int64_t last_modified = 0; | 80 int64_t last_modified = 0; |
79 if (base::StringToInt64(date_created_str, &last_modified)) { | 81 if (base::StringToInt64(last_modified_str, &last_modified)) { |
Peter Kasting
2016/12/01 07:38:24
Woah, this looks like it was a flat-out existing b
ltian
2016/12/01 10:02:58
Yeah, this is the reason caused the problem that t
| |
80 result->last_modified = base::Time::FromInternalValue(last_modified); | 82 result->last_modified = base::Time::FromInternalValue(last_modified); |
81 } | 83 } |
82 | 84 |
85 int64_t last_visited = 0; | |
86 if (base::StringToInt64(last_visited_str, &last_visited)) { | |
Peter Kasting
2016/12/01 07:38:24
Nit: This file is inconsistent about whether it us
ltian
2016/12/01 10:02:58
Done.
| |
87 result->last_visited = base::Time::FromInternalValue(last_visited); | |
88 } | |
89 | |
83 dict.GetInteger(DefaultSearchManager::kUsageCount, &result->usage_count); | 90 dict.GetInteger(DefaultSearchManager::kUsageCount, &result->usage_count); |
84 | 91 |
85 const base::ListValue* alternate_urls = nullptr; | 92 const base::ListValue* alternate_urls = nullptr; |
86 if (dict.GetList(DefaultSearchManager::kAlternateURLs, &alternate_urls)) { | 93 if (dict.GetList(DefaultSearchManager::kAlternateURLs, &alternate_urls)) { |
87 for (const auto& it : *alternate_urls) { | 94 for (const auto& it : *alternate_urls) { |
88 std::string alternate_url; | 95 std::string alternate_url; |
89 if (it->GetAsString(&alternate_url)) | 96 if (it->GetAsString(&alternate_url)) |
90 result->alternate_urls.push_back(std::move(alternate_url)); | 97 result->alternate_urls.push_back(std::move(alternate_url)); |
91 } | 98 } |
92 } | 99 } |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
140 data.image_url_post_params); | 147 data.image_url_post_params); |
141 | 148 |
142 url_dict->SetBoolean(DefaultSearchManager::kSafeForAutoReplace, | 149 url_dict->SetBoolean(DefaultSearchManager::kSafeForAutoReplace, |
143 data.safe_for_autoreplace); | 150 data.safe_for_autoreplace); |
144 | 151 |
145 url_dict->SetString(DefaultSearchManager::kDateCreated, | 152 url_dict->SetString(DefaultSearchManager::kDateCreated, |
146 base::Int64ToString(data.date_created.ToInternalValue())); | 153 base::Int64ToString(data.date_created.ToInternalValue())); |
147 url_dict->SetString( | 154 url_dict->SetString( |
148 DefaultSearchManager::kLastModified, | 155 DefaultSearchManager::kLastModified, |
149 base::Int64ToString(data.last_modified.ToInternalValue())); | 156 base::Int64ToString(data.last_modified.ToInternalValue())); |
157 url_dict->SetString( | |
158 DefaultSearchManager::kLastVisited, | |
159 base::Int64ToString(data.last_visited.ToInternalValue())); | |
150 url_dict->SetInteger(DefaultSearchManager::kUsageCount, data.usage_count); | 160 url_dict->SetInteger(DefaultSearchManager::kUsageCount, data.usage_count); |
151 | 161 |
152 auto alternate_urls = base::MakeUnique<base::ListValue>(); | 162 auto alternate_urls = base::MakeUnique<base::ListValue>(); |
153 for (const auto& alternate_url : data.alternate_urls) | 163 for (const auto& alternate_url : data.alternate_urls) |
154 alternate_urls->AppendString(alternate_url); | 164 alternate_urls->AppendString(alternate_url); |
155 | 165 |
156 url_dict->Set(DefaultSearchManager::kAlternateURLs, | 166 url_dict->Set(DefaultSearchManager::kAlternateURLs, |
157 std::move(alternate_urls)); | 167 std::move(alternate_urls)); |
158 | 168 |
159 auto encodings = base::MakeUnique<base::ListValue>(); | 169 auto encodings = base::MakeUnique<base::ListValue>(); |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
228 &search_terms_replacement_key); | 238 &search_terms_replacement_key); |
229 return base::MakeUnique<TemplateURLData>( | 239 return base::MakeUnique<TemplateURLData>( |
230 name, keyword, search_url, suggest_url, instant_url, image_url, | 240 name, keyword, search_url, suggest_url, instant_url, image_url, |
231 new_tab_url, contextual_search_url, search_url_post_params, | 241 new_tab_url, contextual_search_url, search_url_post_params, |
232 suggest_url_post_params, instant_url_post_params, image_url_post_params, | 242 suggest_url_post_params, instant_url_post_params, image_url_post_params, |
233 favicon_url, encoding, *alternate_urls, search_terms_replacement_key, | 243 favicon_url, encoding, *alternate_urls, search_terms_replacement_key, |
234 id); | 244 id); |
235 } | 245 } |
236 return std::unique_ptr<TemplateURLData>(); | 246 return std::unique_ptr<TemplateURLData>(); |
237 } | 247 } |
OLD | NEW |