| 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/bookmark_bridge.h" | 5 #include "chrome/browser/android/bookmarks/bookmark_bridge.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| 11 #include "base/android/jni_string.h" | 11 #include "base/android/jni_string.h" |
| 12 #include "base/containers/stack_container.h" | 12 #include "base/containers/stack_container.h" |
| 13 #include "base/i18n/string_compare.h" | 13 #include "base/i18n/string_compare.h" |
| 14 #include "base/memory/ptr_util.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 15 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" | 16 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" |
| 16 #include "chrome/browser/profiles/incognito_helpers.h" | 17 #include "chrome/browser/profiles/incognito_helpers.h" |
| 17 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/profiles/profile_android.h" | 19 #include "chrome/browser/profiles/profile_android.h" |
| 19 #include "chrome/browser/signin/signin_manager_factory.h" | 20 #include "chrome/browser/signin/signin_manager_factory.h" |
| 20 #include "chrome/browser/undo/bookmark_undo_service_factory.h" | 21 #include "chrome/browser/undo/bookmark_undo_service_factory.h" |
| 21 #include "components/bookmarks/browser/bookmark_match.h" | 22 #include "components/bookmarks/browser/bookmark_match.h" |
| 22 #include "components/bookmarks/browser/bookmark_model.h" | 23 #include "components/bookmarks/browser/bookmark_model.h" |
| 23 #include "components/bookmarks/browser/bookmark_utils.h" | 24 #include "components/bookmarks/browser/bookmark_utils.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 const JavaParamRef<jobject>& obj) { | 154 const JavaParamRef<jobject>& obj) { |
| 154 return IsEditBookmarksEnabled(); | 155 return IsEditBookmarksEnabled(); |
| 155 } | 156 } |
| 156 | 157 |
| 157 void BookmarkBridge::LoadEmptyPartnerBookmarkShimForTesting( | 158 void BookmarkBridge::LoadEmptyPartnerBookmarkShimForTesting( |
| 158 JNIEnv* env, | 159 JNIEnv* env, |
| 159 const JavaParamRef<jobject>& obj) { | 160 const JavaParamRef<jobject>& obj) { |
| 160 if (partner_bookmarks_shim_->IsLoaded()) | 161 if (partner_bookmarks_shim_->IsLoaded()) |
| 161 return; | 162 return; |
| 162 partner_bookmarks_shim_->SetPartnerBookmarksRoot( | 163 partner_bookmarks_shim_->SetPartnerBookmarksRoot( |
| 163 new BookmarkPermanentNode(0)); | 164 base::MakeUnique<BookmarkPermanentNode>(0)); |
| 164 DCHECK(partner_bookmarks_shim_->IsLoaded()); | 165 DCHECK(partner_bookmarks_shim_->IsLoaded()); |
| 165 } | 166 } |
| 166 | 167 |
| 167 ScopedJavaLocalRef<jobject> BookmarkBridge::GetBookmarkByID( | 168 ScopedJavaLocalRef<jobject> BookmarkBridge::GetBookmarkByID( |
| 168 JNIEnv* env, | 169 JNIEnv* env, |
| 169 const JavaParamRef<jobject>& obj, | 170 const JavaParamRef<jobject>& obj, |
| 170 jlong id, | 171 jlong id, |
| 171 jint type) { | 172 jint type) { |
| 172 DCHECK(IsLoaded()); | 173 DCHECK(IsLoaded()); |
| 173 const BookmarkNode* node = GetNodeByID(id, type); | 174 const BookmarkNode* node = GetNodeByID(id, type); |
| (...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1084 BookmarkModelChanged(); | 1085 BookmarkModelChanged(); |
| 1085 } | 1086 } |
| 1086 | 1087 |
| 1087 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1088 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
| 1088 NotifyIfDoneLoading(); | 1089 NotifyIfDoneLoading(); |
| 1089 } | 1090 } |
| 1090 | 1091 |
| 1091 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1092 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
| 1092 partner_bookmarks_shim_ = NULL; | 1093 partner_bookmarks_shim_ = NULL; |
| 1093 } | 1094 } |
| OLD | NEW |