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

Side by Side Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 756333003: Prompt for unmasking Wallet credit card on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge conflicts Created 6 years 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/chrome_jni_registrar.h" 5 #include "chrome/browser/android/chrome_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "chrome/browser/profiles/profile_android.h" 54 #include "chrome/browser/profiles/profile_android.h"
55 #include "chrome/browser/search_engines/template_url_service_android.h" 55 #include "chrome/browser/search_engines/template_url_service_android.h"
56 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 56 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
57 #include "chrome/browser/speech/tts_android.h" 57 #include "chrome/browser/speech/tts_android.h"
58 #include "chrome/browser/sync/profile_sync_service_android.h" 58 #include "chrome/browser/sync/profile_sync_service_android.h"
59 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 59 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
60 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h" 60 #include "chrome/browser/ui/android/autofill/autofill_dialog_result.h"
61 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h" 61 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
62 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h" 62 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
63 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 63 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
64 #include "chrome/browser/ui/android/autofill/instrument_unmask_prompt_view_andro id.h"
64 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h" 65 #include "chrome/browser/ui/android/autofill/password_generation_popup_view_andr oid.h"
65 #include "chrome/browser/ui/android/chrome_http_auth_handler.h" 66 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
66 #include "chrome/browser/ui/android/context_menu_helper.h" 67 #include "chrome/browser/ui/android/context_menu_helper.h"
67 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h" 68 #include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android .h"
68 #include "chrome/browser/ui/android/infobars/confirm_infobar.h" 69 #include "chrome/browser/ui/android/infobars/confirm_infobar.h"
69 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h" 70 #include "chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h"
70 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h" 71 #include "chrome/browser/ui/android/infobars/generated_password_saved_infobar.h"
71 #include "chrome/browser/ui/android/infobars/infobar_android.h" 72 #include "chrome/browser/ui/android/infobars/infobar_android.h"
72 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 73 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
73 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 74 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, 154 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper },
154 { "FeatureUtilities", RegisterFeatureUtilities }, 155 { "FeatureUtilities", RegisterFeatureUtilities },
155 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter }, 156 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter },
156 { "FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge }, 157 { "FindInPageBridge", FindInPageBridge::RegisterFindInPageBridge },
157 { "FontSizePrefsAndroid", FontSizePrefsAndroid::Register }, 158 { "FontSizePrefsAndroid", FontSizePrefsAndroid::Register },
158 { "ForeignSessionHelper", 159 { "ForeignSessionHelper",
159 ForeignSessionHelper::RegisterForeignSessionHelper }, 160 ForeignSessionHelper::RegisterForeignSessionHelper },
160 { "GeneratedPasswordSavedInfoBarDelegate", 161 { "GeneratedPasswordSavedInfoBarDelegate",
161 RegisterGeneratedPasswordSavedInfoBarDelegate }, 162 RegisterGeneratedPasswordSavedInfoBarDelegate },
162 { "InfoBarContainer", RegisterInfoBarContainer }, 163 { "InfoBarContainer", RegisterInfoBarContainer },
164 { "InstrumentUnmaskPrompt",
165 autofill::InstrumentUnmaskPromptViewAndroid::Register },
163 { "InvalidationServiceFactory", 166 { "InvalidationServiceFactory",
164 invalidation::InvalidationServiceFactoryAndroid::Register }, 167 invalidation::InvalidationServiceFactoryAndroid::Register },
165 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, 168 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper },
166 { "IntentHelper", RegisterIntentHelper }, 169 { "IntentHelper", RegisterIntentHelper },
167 { "JavascriptAppModalDialog", 170 { "JavascriptAppModalDialog",
168 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog }, 171 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog },
169 { "LogoBridge", RegisterLogoBridge }, 172 { "LogoBridge", RegisterLogoBridge },
170 { "MostVisitedSites", MostVisitedSites::Register }, 173 { "MostVisitedSites", MostVisitedSites::Register },
171 { "NativeInfoBar", RegisterNativeInfoBar }, 174 { "NativeInfoBar", RegisterNativeInfoBar },
172 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, 175 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 }; 217 };
215 218
216 bool RegisterJni(JNIEnv* env) { 219 bool RegisterJni(JNIEnv* env) {
217 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 220 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
218 return RegisterNativeMethods(env, kChromeRegisteredMethods, 221 return RegisterNativeMethods(env, kChromeRegisteredMethods,
219 arraysize(kChromeRegisteredMethods)); 222 arraysize(kChromeRegisteredMethods));
220 } 223 }
221 224
222 } // namespace android 225 } // namespace android
223 } // namespace chrome 226 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698