chrome/browser/android/chrome_jni_registrar.cc - Issue 2623023002: Remove //chrome as an embedder of blimp.

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 2623023002: Remove //chrome as an embedder of blimp. (Closed)

Patch Set: One more rebase for good measure Created 3 years, 11 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/browser/android/blimp/chrome_compositor_dependencies.cc ('k') | chrome/browser/android/preferences/browser_prefs_android.cc » ('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 ca618cb1e531cd8532c367013d4b4bf2c6fdfa32..b4fc6c596eb3567e101c7e8169cfe8085abb9c67 100644

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

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

@@ -8,14 +8,11 @@

#include "base/android/jni_registrar.h"

#include "base/macros.h"

#include "base/trace_event/trace_event.h"

-#include "blimp/client/public/android/blimp_jni_registrar.h"

#include "chrome/browser/after_startup_task_utils_android.h"

#include "chrome/browser/android/accessibility/font_size_prefs_android.h"

#include "chrome/browser/android/appmenu/app_menu_drag_helper.h"

#include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"

#include "chrome/browser/android/banners/app_banner_manager_android.h"

-#include "chrome/browser/android/blimp/blimp_client_context_factory_android.h"

-#include "chrome/browser/android/blimp/chrome_blimp_client_context_delegate_android.h"

#include "chrome/browser/android/bookmarks/bookmark_bridge.h"

#include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"

#include "chrome/browser/android/bottombar/overlay_panel_content.h"

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

{"AutofillProfileBridge", autofill::RegisterAutofillProfileBridge},

{"BackgroundSchedulerBridge",

offline_pages::android::RegisterBackgroundSchedulerBridge},

- {"BlimpClientContextFactory", RegisterBlimpClientContextFactoryJni},

- {"Blimp", blimp::client::RegisterBlimpJni},

{"BluetoothChooserAndroid", BluetoothChooserAndroid::Register},

{"BookmarkBridge", BookmarkBridge::RegisterBookmarkBridge},

{"BrowsingDataCounterBridge", BrowsingDataCounterBridge::Register},

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

{"ChildAccountService", RegisterChildAccountService},

{"ChromeApplication", chrome::android::ChromeApplication::RegisterBindings},

{"ChromeBackupAgent", chrome::android::RegisterBackupAgent},

- {"ChromeBlimpClientContextDelegate",

- ChromeBlimpClientContextDelegateAndroid::RegisterJni},

{"ChromeBrowserProvider",

ChromeBrowserProvider::RegisterChromeBrowserProvider},

{"ChromeFeatureList", chrome::android::RegisterChromeFeatureListJni},