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

Side by Side Diff: chrome/browser/android/bookmarks/bookmarks_bridge.cc

Issue 431843002: Add description editing functions in bookmark bridge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 unified diff | Download patch
OLDNEW
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_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/containers/stack_container.h" 8 #include "base/containers/stack_container.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"
11 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" 11 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
12 #include "chrome/browser/profiles/incognito_helpers.h" 12 #include "chrome/browser/profiles/incognito_helpers.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/profiles/profile_android.h" 14 #include "chrome/browser/profiles/profile_android.h"
15 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/signin/signin_manager_factory.h" 16 #include "chrome/browser/signin/signin_manager_factory.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "components/bookmarks/browser/bookmark_model.h" 18 #include "components/bookmarks/browser/bookmark_model.h"
19 #include "components/bookmarks/browser/bookmark_utils.h" 19 #include "components/bookmarks/browser/bookmark_utils.h"
20 #include "components/enhanced_bookmarks/metadata_accessor.h"
20 #include "components/signin/core/browser/signin_manager.h" 21 #include "components/signin/core/browser/signin_manager.h"
21 #include "content/public/browser/browser_thread.h" 22 #include "content/public/browser/browser_thread.h"
22 #include "jni/BookmarksBridge_jni.h" 23 #include "jni/BookmarksBridge_jni.h"
23 24
24 using base::android::AttachCurrentThread; 25 using base::android::AttachCurrentThread;
25 using base::android::ConvertUTF8ToJavaString; 26 using base::android::ConvertUTF8ToJavaString;
26 using base::android::ConvertUTF16ToJavaString; 27 using base::android::ConvertUTF16ToJavaString;
27 using base::android::ScopedJavaLocalRef; 28 using base::android::ScopedJavaLocalRef;
28 using base::android::ScopedJavaGlobalRef; 29 using base::android::ScopedJavaGlobalRef;
29 using content::BrowserThread; 30 using content::BrowserThread;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 jobject obj, 238 jobject obj,
238 jlong id, 239 jlong id,
239 jint type, 240 jint type,
240 jstring url) { 241 jstring url) {
241 DCHECK(IsLoaded()); 242 DCHECK(IsLoaded());
242 bookmark_model_->SetURL( 243 bookmark_model_->SetURL(
243 GetNodeByID(id, type), 244 GetNodeByID(id, type),
244 GURL(base::android::ConvertJavaStringToUTF16(env, url))); 245 GURL(base::android::ConvertJavaStringToUTF16(env, url)));
245 } 246 }
246 247
248 base::android::ScopedJavaLocalRef<jstring>
249 BookmarksBridge::GetBookmarkDescription(JNIEnv* env,
250 jobject obj,
251 jlong id,
252 jint type) {
253 DCHECK(IsLoaded());
254 return base::android::ConvertUTF8ToJavaString(
255 env, enhanced_bookmarks::DescriptionFromBookmark(GetNodeByID(id, type)));
256 }
257
258 void BookmarksBridge::SetBookmarkDescription(JNIEnv* env,
259 jobject obj,
260 jlong id,
261 jint type,
262 jstring description) {
Kibeom Kim (inactive) 2014/07/31 02:03:40 nit: function parameters line wrapping.
263 DCHECK(IsLoaded());
264 enhanced_bookmarks::SetDescriptionForBookmark(
265 bookmark_model_,
266 GetNodeByID(id, type),
267 base::android::ConvertJavaStringToUTF8(env, description));
268 }
269
247 void BookmarksBridge::GetBookmarksForFolder(JNIEnv* env, 270 void BookmarksBridge::GetBookmarksForFolder(JNIEnv* env,
248 jobject obj, 271 jobject obj,
249 jobject j_folder_id_obj, 272 jobject j_folder_id_obj,
250 jobject j_callback_obj, 273 jobject j_callback_obj,
251 jobject j_result_obj) { 274 jobject j_result_obj) {
252 DCHECK(IsLoaded()); 275 DCHECK(IsLoaded());
253 long folder_id = Java_BookmarkId_getId(env, j_folder_id_obj); 276 long folder_id = Java_BookmarkId_getId(env, j_folder_id_obj);
254 int type = Java_BookmarkId_getType(env, j_folder_id_obj); 277 int type = Java_BookmarkId_getType(env, j_folder_id_obj);
255 const BookmarkNode* folder = GetFolderWithFallback(folder_id, type); 278 const BookmarkNode* folder = GetFolderWithFallback(folder_id, type);
256 279
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 BookmarkModelChanged(); 658 BookmarkModelChanged();
636 } 659 }
637 660
638 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { 661 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
639 NotifyIfDoneLoading(); 662 NotifyIfDoneLoading();
640 } 663 }
641 664
642 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { 665 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
643 partner_bookmarks_shim_ = NULL; 666 partner_bookmarks_shim_ = NULL;
644 } 667 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698