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

Unified Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 1057533005: Make service tab launcher a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/DEPS ('k') | chrome/browser/android/service_tab_launcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 3b334425461297bf8fa395757969f8592d0003e5..5702111bca8db9acb1f6abe9e478b8681dcc4acd 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -51,7 +51,6 @@
#include "chrome/browser/android/profiles/profile_downloader_android.h"
#include "chrome/browser/android/provider/chrome_browser_provider.h"
#include "chrome/browser/android/recently_closed_tabs_bridge.h"
-#include "chrome/browser/android/service_tab_launcher.h"
#include "chrome/browser/android/shortcut_helper.h"
#include "chrome/browser/android/signin/account_management_screen_helper.h"
#include "chrome/browser/android/signin/signin_manager_android.h"
@@ -113,6 +112,7 @@
#include "components/gcm_driver/android/component_jni_registrar.h"
#include "components/invalidation/android/component_jni_registrar.h"
#include "components/navigation_interception/component_jni_registrar.h"
+#include "components/service_tab_launcher/component_jni_registrar.h"
#include "components/variations/android/component_jni_registrar.h"
#include "components/web_contents_delegate_android/component_jni_registrar.h"
@@ -237,7 +237,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge},
{"SavePasswordInfoBar", SavePasswordInfoBar::Register},
{"SceneLayer", chrome::android::RegisterSceneLayer},
- {"ServiceTabLauncher", ServiceTabLauncher::RegisterServiceTabLauncher},
+ {"ServiceTabLauncher", service_tab_launcher::RegisterServiceTabLauncherJni},
{"SigninManager", SigninManagerAndroid::Register},
{"SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
{"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid},
« no previous file with comments | « chrome/browser/android/DEPS ('k') | chrome/browser/android/service_tab_launcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698