Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1377)

Unified Diff: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc

Issue 598593007: Make EnhancedBookmarkBridge initialized with profile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
diff --git a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
index 37d172d314987027692794b3de9224fc5bd1085e..90c8504f2161ec358275d38dc40f7ee2834065e2 100644
--- a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
+++ b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h"
#include "base/android/jni_string.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
+#include "chrome/browser/profiles/profile_android.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_utils.h"
#include "components/bookmarks/common/android/bookmark_type.h"
@@ -18,8 +20,9 @@ namespace android {
EnhancedBookmarksBridge::EnhancedBookmarksBridge(JNIEnv* env,
jobject obj,
- jlong bookmark_model_ptr) {
- bookmark_model_ = reinterpret_cast<BookmarkModel*>(bookmark_model_ptr);
+ Profile* profile) {
+ profile_ = profile;
+ bookmark_model_ = BookmarkModelFactory::GetForProfile(profile_);
}
void EnhancedBookmarksBridge::Destroy(JNIEnv*, jobject) {
@@ -56,9 +59,9 @@ void EnhancedBookmarksBridge::SetBookmarkDescription(JNIEnv* env,
base::android::ConvertJavaStringToUTF8(env, description));
}
-static jlong Init(JNIEnv* env, jobject obj, jlong bookmark_model_ptr) {
- return reinterpret_cast<jlong>(
- new EnhancedBookmarksBridge(env, obj, bookmark_model_ptr));
+static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) {
+ return reinterpret_cast<jlong>(new EnhancedBookmarksBridge(
+ env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));
}
bool RegisterEnhancedBookmarksBridge(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698