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/bookmarks_bridge.h" | 5 #include "chrome/browser/android/bookmarks/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/containers/stack_container.h" | 9 #include "base/containers/stack_container.h" |
10 #include "base/i18n/string_compare.h" | 10 #include "base/i18n/string_compare.h" |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 | 127 |
128 void BookmarksBridge::Destroy(JNIEnv*, jobject) { | 128 void BookmarksBridge::Destroy(JNIEnv*, jobject) { |
129 delete this; | 129 delete this; |
130 } | 130 } |
131 | 131 |
132 // static | 132 // static |
133 bool BookmarksBridge::RegisterBookmarksBridge(JNIEnv* env) { | 133 bool BookmarksBridge::RegisterBookmarksBridge(JNIEnv* env) { |
134 return RegisterNativesImpl(env); | 134 return RegisterNativesImpl(env); |
135 } | 135 } |
136 | 136 |
137 static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) { | 137 static jlong Init(JNIEnv* env, |
| 138 const JavaParamRef<jobject>& obj, |
| 139 const JavaParamRef<jobject>& j_profile) { |
138 BookmarksBridge* delegate = new BookmarksBridge(env, obj, j_profile); | 140 BookmarksBridge* delegate = new BookmarksBridge(env, obj, j_profile); |
139 return reinterpret_cast<intptr_t>(delegate); | 141 return reinterpret_cast<intptr_t>(delegate); |
140 } | 142 } |
141 | 143 |
142 static jboolean IsEnhancedBookmarksFeatureEnabled(JNIEnv* env, | 144 static jboolean IsEnhancedBookmarksFeatureEnabled( |
143 jclass clazz) { | 145 JNIEnv* env, |
| 146 const JavaParamRef<jclass>& clazz) { |
144 return enhanced_bookmarks::IsEnhancedBookmarksEnabled(); | 147 return enhanced_bookmarks::IsEnhancedBookmarksEnabled(); |
145 } | 148 } |
146 | 149 |
147 jboolean BookmarksBridge::IsEditBookmarksEnabled(JNIEnv* env, jobject obj) { | 150 jboolean BookmarksBridge::IsEditBookmarksEnabled(JNIEnv* env, jobject obj) { |
148 return IsEditBookmarksEnabled(); | 151 return IsEditBookmarksEnabled(); |
149 } | 152 } |
150 | 153 |
151 void BookmarksBridge::LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env, | 154 void BookmarksBridge::LoadEmptyPartnerBookmarkShimForTesting(JNIEnv* env, |
152 jobject obj) { | 155 jobject obj) { |
153 if (partner_bookmarks_shim_->IsLoaded()) | 156 if (partner_bookmarks_shim_->IsLoaded()) |
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1064 BookmarkModelChanged(); | 1067 BookmarkModelChanged(); |
1065 } | 1068 } |
1066 | 1069 |
1067 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1070 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
1068 NotifyIfDoneLoading(); | 1071 NotifyIfDoneLoading(); |
1069 } | 1072 } |
1070 | 1073 |
1071 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1074 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
1072 partner_bookmarks_shim_ = NULL; | 1075 partner_bookmarks_shim_ = NULL; |
1073 } | 1076 } |
OLD | NEW |