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

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

Issue 1256283002: GAIA ID migration for Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: full version Created 5 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 side-by-side diff with in-line comments
Download patch
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 a7c1d5fe26a32df09caf324da599c8e9ffc8ea86..f2c39768ab9e0829901e43e25a2d653e6779edc0 100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -67,6 +67,7 @@
#include "chrome/browser/android/rlz/revenue_stats.h"
#include "chrome/browser/android/shortcut_helper.h"
#include "chrome/browser/android/signin/account_management_screen_helper.h"
+#include "chrome/browser/android/signin/account_tracker_service_android.h"
#include "chrome/browser/android/signin/signin_manager_android.h"
#include "chrome/browser/android/tab/thumbnail_tab_helper_android.h"
#include "chrome/browser/android/tab_android.h"
@@ -168,6 +169,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
{"AccessibilityUtils", AccessibilityUtil::Register},
{"AccountChooserInfoBar", RegisterAccountChooserInfoBar},
{"AccountManagementScreenHelper", AccountManagementScreenHelper::Register},
+ {"AccountTrackerService", AccountTrackerServiceAndroid::Register},
{"AnswersImageBridge", RegisterAnswersImageBridge},
{"AppBannerInfoBarAndroid", RegisterAppBannerInfoBarAndroid},
{"AppBannerInfoBarDelegateAndroid",
@@ -199,9 +201,9 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
#if defined(ENABLE_MEDIA_ROUTER)
{"ChromeMediaRouter", media_router::MediaRouterAndroid::Register},
{"ChromeMediaRouterDialogController",
- media_router::MediaRouterDialogControllerAndroid::Register},
+ media_router::MediaRouterDialogControllerAndroid::Register},
#endif
- {"ChromeWebContentsDelegateAndroid",
+ {"ChromeWebContentsDelegateAndroid",
RegisterChromeWebContentsDelegateAndroid},
{"CompositorView", RegisterCompositorView},
{"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},

Powered by Google App Engine
This is Rietveld 408576698