OLD | NEW |
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 "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" | 5 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
6 | 6 |
7 #include <tuple> | 7 #include <tuple> |
8 | 8 |
9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 void PartnerBookmarksShim::AddObserver( | 130 void PartnerBookmarksShim::AddObserver( |
131 PartnerBookmarksShim::Observer* observer) { | 131 PartnerBookmarksShim::Observer* observer) { |
132 observers_.AddObserver(observer); | 132 observers_.AddObserver(observer); |
133 } | 133 } |
134 | 134 |
135 void PartnerBookmarksShim::RemoveObserver( | 135 void PartnerBookmarksShim::RemoveObserver( |
136 PartnerBookmarksShim::Observer* observer) { | 136 PartnerBookmarksShim::Observer* observer) { |
137 observers_.RemoveObserver(observer); | 137 observers_.RemoveObserver(observer); |
138 } | 138 } |
139 | 139 |
140 const BookmarkNode* PartnerBookmarksShim::GetNodeByID(int64 id) const { | 140 const BookmarkNode* PartnerBookmarksShim::GetNodeByID(int64_t id) const { |
141 DCHECK(IsLoaded()); | 141 DCHECK(IsLoaded()); |
142 if (!HasPartnerBookmarks()) | 142 if (!HasPartnerBookmarks()) |
143 return NULL; | 143 return NULL; |
144 return GetNodeByID(GetPartnerBookmarksRoot(), id); | 144 return GetNodeByID(GetPartnerBookmarksRoot(), id); |
145 } | 145 } |
146 | 146 |
147 base::string16 PartnerBookmarksShim::GetTitle(const BookmarkNode* node) const { | 147 base::string16 PartnerBookmarksShim::GetTitle(const BookmarkNode* node) const { |
148 DCHECK(node); | 148 DCHECK(node); |
149 DCHECK(IsPartnerBookmark(node)); | 149 DCHECK(IsPartnerBookmark(node)); |
150 | 150 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 observers_(base::ObserverList< | 218 observers_(base::ObserverList< |
219 PartnerBookmarksShim::Observer>::NOTIFY_EXISTING_ONLY) { | 219 PartnerBookmarksShim::Observer>::NOTIFY_EXISTING_ONLY) { |
220 } | 220 } |
221 | 221 |
222 PartnerBookmarksShim::~PartnerBookmarksShim() { | 222 PartnerBookmarksShim::~PartnerBookmarksShim() { |
223 FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_, | 223 FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_, |
224 ShimBeingDeleted(this)); | 224 ShimBeingDeleted(this)); |
225 } | 225 } |
226 | 226 |
227 const BookmarkNode* PartnerBookmarksShim::GetNodeByID( | 227 const BookmarkNode* PartnerBookmarksShim::GetNodeByID( |
228 const BookmarkNode* parent, int64 id) const { | 228 const BookmarkNode* parent, |
| 229 int64_t id) const { |
229 if (parent->id() == id) | 230 if (parent->id() == id) |
230 return parent; | 231 return parent; |
231 for (int i = 0, child_count = parent->child_count(); i < child_count; ++i) { | 232 for (int i = 0, child_count = parent->child_count(); i < child_count; ++i) { |
232 const BookmarkNode* result = GetNodeByID(parent->GetChild(i), id); | 233 const BookmarkNode* result = GetNodeByID(parent->GetChild(i), id); |
233 if (result) | 234 if (result) |
234 return result; | 235 return result; |
235 } | 236 } |
236 return NULL; | 237 return NULL; |
237 } | 238 } |
238 | 239 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 i != node_rename_remove_map_.end(); | 282 i != node_rename_remove_map_.end(); |
282 ++i) { | 283 ++i) { |
283 base::DictionaryValue* dict = new base::DictionaryValue(); | 284 base::DictionaryValue* dict = new base::DictionaryValue(); |
284 dict->SetString(kMappingUrl, i->first.url().spec()); | 285 dict->SetString(kMappingUrl, i->first.url().spec()); |
285 dict->SetString(kMappingProviderTitle, i->first.provider_title()); | 286 dict->SetString(kMappingProviderTitle, i->first.provider_title()); |
286 dict->SetString(kMappingTitle, i->second); | 287 dict->SetString(kMappingTitle, i->second); |
287 list.Append(dict); | 288 list.Append(dict); |
288 } | 289 } |
289 prefs_->Set(prefs::kPartnerBookmarkMappings, list); | 290 prefs_->Set(prefs::kPartnerBookmarkMappings, list); |
290 } | 291 } |
OLD | NEW |