chrome/browser/android/chrome_jni_registrar.cc - Issue 597253003: Migrate EnhancedBookmarkBridge from component to chrome/browswer

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/chrome_jni_registrar.cc

Issue 597253003: Migrate EnhancedBookmarkBridge from component to chrome/browswer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java ('k') | chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 6ba59686651d51b40181ea3b4798e4c0e3ddb702..da7f67b4d3698d64a024271a1bc628a9002f4f1b 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -17,6 +17,7 @@

#include "chrome/browser/android/content_view_util.h"

#include "chrome/browser/android/dev_tools_server.h"

#include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"

+#include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h"

#include "chrome/browser/android/favicon_helper.h"

#include "chrome/browser/android/foreign_session_helper.h"

#include "chrome/browser/android/intent_helper.h"

@@ -74,7 +75,6 @@

#include "chrome/browser/ui/android/website_settings_popup_android.h"

#include "components/bookmarks/common/android/component_jni_registrar.h"

#include "components/dom_distiller/android/component_jni_registrar.h"

-#include "components/enhanced_bookmarks/android/component_jni_registrar.h"

#include "components/gcm_driver/android/component_jni_registrar.h"

#include "components/navigation_interception/component_jni_registrar.h"

#include "components/variations/android/component_jni_registrar.h"

@@ -93,8 +93,6 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

// Register JNI for components we depend on.

{ "Bookmarks", bookmarks::android::RegisterBookmarks },

{ "DomDistiller", dom_distiller::android::RegisterDomDistiller },

- { "EnhancedBookmarks",

- enhanced_bookmarks::android::RegisterEnhancedBookmarks },

{ "GCMDriver", gcm::android::RegisterGCMDriverJni },

{ "NavigationInterception",

navigation_interception::RegisterNavigationInterceptionJni },

@@ -139,6 +137,8 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{ "DomDistillerServiceFactory",

dom_distiller::android::DomDistillerServiceFactoryAndroid::Register },

{ "DomDistillerTabUtils", RegisterDomDistillerTabUtils },

+ { "EnhancedBookmarksBridge",

+ enhanced_bookmarks::android::RegisterEnhancedBookmarksBridge},

{ "ExternalPrerenderRequestHandler",

prerender::ExternalPrerenderHandlerAndroid::

RegisterExternalPrerenderHandlerAndroid },