| 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/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h" | 5 #include "chrome/browser/android/enhanced_bookmarks/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 11 matching lines...) Expand all Loading... |
| 22 #include "components/bookmarks/common/android/bookmark_type.h" | 22 #include "components/bookmarks/common/android/bookmark_type.h" |
| 23 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h" | 23 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h" |
| 24 #include "components/signin/core/browser/signin_manager.h" | 24 #include "components/signin/core/browser/signin_manager.h" |
| 25 #include "content/public/browser/browser_thread.h" | 25 #include "content/public/browser/browser_thread.h" |
| 26 #include "jni/EnhancedBookmarksBridge_jni.h" | 26 #include "jni/EnhancedBookmarksBridge_jni.h" |
| 27 | 27 |
| 28 using base::android::AttachCurrentThread; | 28 using base::android::AttachCurrentThread; |
| 29 using bookmarks::android::JavaBookmarkIdCreateBookmarkId; | 29 using bookmarks::android::JavaBookmarkIdCreateBookmarkId; |
| 30 using bookmarks::android::JavaBookmarkIdGetId; | 30 using bookmarks::android::JavaBookmarkIdGetId; |
| 31 using bookmarks::android::JavaBookmarkIdGetType; | 31 using bookmarks::android::JavaBookmarkIdGetType; |
| 32 using bookmarks::BookmarkNode; |
| 32 using bookmarks::BookmarkType; | 33 using bookmarks::BookmarkType; |
| 33 using content::BrowserThread; | 34 using content::BrowserThread; |
| 34 | 35 |
| 35 namespace enhanced_bookmarks { | 36 namespace enhanced_bookmarks { |
| 36 namespace android { | 37 namespace android { |
| 37 | 38 |
| 38 EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env, | 39 EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env, |
| 39 jobject obj, | 40 jobject obj, |
| 40 Profile* profile) : weak_java_ref_(env, obj) { | 41 Profile* profile) : weak_java_ref_(env, obj) { |
| 41 profile_ = profile; | 42 profile_ = profile; |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 return reinterpret_cast<jlong>(new EnhancedBookmarksBridge( | 262 return reinterpret_cast<jlong>(new EnhancedBookmarksBridge( |
| 262 env, obj, ProfileAndroid::FromProfileAndroid(j_profile))); | 263 env, obj, ProfileAndroid::FromProfileAndroid(j_profile))); |
| 263 } | 264 } |
| 264 | 265 |
| 265 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) { | 266 bool RegisterEnhancedBookmarksBridge(JNIEnv* env) { |
| 266 return RegisterNativesImpl(env); | 267 return RegisterNativesImpl(env); |
| 267 } | 268 } |
| 268 | 269 |
| 269 } // namespace android | 270 } // namespace android |
| 270 } // namespace enhanced_bookmarks | 271 } // namespace enhanced_bookmarks |
| OLD | NEW |