chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc - Issue 659493003: Final step of the java_cpp_template -> java_cpp_enum migration.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 659493003: Final step of the java_cpp_template -> java_cpp_enum migration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: delete some more template files Created 6 years, 2 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

« chrome/browser/android/activity_type_id_list.h ('K') | « chrome/browser/android/bookmarks/bookmarks_bridge.cc ('k') | chrome/browser/android/tab_android.h » ('j') | chrome/browser/sync/profile_sync_service_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7cc408b75ef3de127aa063aab00cb9d935a5eb8d..50316c797e827ec99575f2827f1132fa99c7c2f9 100644

--- a/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc

+++ b/chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc

@@ -43,7 +43,7 @@ void EnhancedBookmarksBridge::Destroy(JNIEnv*, jobject) {

ScopedJavaLocalRef<jstring> EnhancedBookmarksBridge::GetBookmarkDescription(

JNIEnv* env, jobject obj, jlong id, jint type) {

DCHECK(bookmark_model_->loaded());

- DCHECK_EQ(type, BookmarkType::NORMAL);

+ DCHECK_EQ(type, BookmarkType::BOOKMARK_TYPE_NORMAL);

Lei Zhang 2014/10/14 22:52:40 If you don't mind, flip this around because it's D

mkosiba (inactive) 2014/10/16 12:45:07 Done.

const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(

bookmark_model_, static_cast<int64>(id));

@@ -60,7 +60,7 @@ void EnhancedBookmarksBridge::SetBookmarkDescription(JNIEnv* env,

jint type,

jstring description) {

DCHECK(bookmark_model_->loaded());

- DCHECK_EQ(type, BookmarkType::NORMAL);

+ DCHECK_EQ(type, BookmarkType::BOOKMARK_TYPE_NORMAL);

const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(

bookmark_model_, static_cast<int64>(id));