OLD | NEW |
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 "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h" | 5 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h" |
6 | 6 |
7 #include "base/android/jni_array.h" | 7 #include "base/android/jni_array.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 } | 206 } |
207 ScopedJavaLocalRef<jobject> new_java_obj = JavaBookmarkIdCreateBookmarkId( | 207 ScopedJavaLocalRef<jobject> new_java_obj = JavaBookmarkIdCreateBookmarkId( |
208 env, new_node->id(), BookmarkType::BOOKMARK_TYPE_NORMAL); | 208 env, new_node->id(), BookmarkType::BOOKMARK_TYPE_NORMAL); |
209 return new_java_obj; | 209 return new_java_obj; |
210 } | 210 } |
211 | 211 |
212 void EnhancedBookmarksBridge::MoveBookmark(JNIEnv* env, | 212 void EnhancedBookmarksBridge::MoveBookmark(JNIEnv* env, |
213 jobject obj, | 213 jobject obj, |
214 jobject j_bookmark_id_obj, | 214 jobject j_bookmark_id_obj, |
215 jobject j_parent_id_obj) { | 215 jobject j_parent_id_obj) { |
216 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 216 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
217 DCHECK(enhanced_bookmark_model_->loaded()); | 217 DCHECK(enhanced_bookmark_model_->loaded()); |
218 | 218 |
219 long bookmark_id = JavaBookmarkIdGetId(env, j_bookmark_id_obj); | 219 long bookmark_id = JavaBookmarkIdGetId(env, j_bookmark_id_obj); |
220 const BookmarkNode* node = bookmarks::GetBookmarkNodeByID( | 220 const BookmarkNode* node = bookmarks::GetBookmarkNodeByID( |
221 enhanced_bookmark_model_->bookmark_model(), | 221 enhanced_bookmark_model_->bookmark_model(), |
222 static_cast<int64>(bookmark_id)); | 222 static_cast<int64>(bookmark_id)); |
223 if (!IsEditable(node)) { | 223 if (!IsEditable(node)) { |
224 NOTREACHED(); | 224 NOTREACHED(); |
225 return; | 225 return; |
226 } | 226 } |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 return reinterpret_cast<jlong>(new EnhancedBookmarksBridge( | 317 return reinterpret_cast<jlong>(new EnhancedBookmarksBridge( |
318 env, obj, ProfileAndroid::FromProfileAndroid(j_profile))); | 318 env, obj, ProfileAndroid::FromProfileAndroid(j_profile))); |
319 } | 319 } |
320 | 320 |
321 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) { | 321 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) { |
322 return RegisterNativesImpl(env); | 322 return RegisterNativesImpl(env); |
323 } | 323 } |
324 | 324 |
325 } // namespace android | 325 } // namespace android |
326 } // namespace enhanced_bookmarks | 326 } // namespace enhanced_bookmarks |
OLD | NEW |