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

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

Issue 1739523002: WebUsb Android chooser UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address reillgy@'s comments Created 4 years, 9 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 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/macros.h" 9 #include "base/macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 150 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
151 #include "chrome/browser/ui/android/infobars/update_password_infobar.h" 151 #include "chrome/browser/ui/android/infobars/update_password_infobar.h"
152 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 152 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
153 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h" 153 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h"
154 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 154 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
155 #include "chrome/browser/ui/android/snackbars/auto_signin_prompt_controller.h" 155 #include "chrome/browser/ui/android/snackbars/auto_signin_prompt_controller.h"
156 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 156 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
157 #include "chrome/browser/ui/android/tab_model/single_tab_model.h" 157 #include "chrome/browser/ui/android/tab_model/single_tab_model.h"
158 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" 158 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
159 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 159 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
160 #include "chrome/browser/ui/android/usb_chooser_android.h"
160 #include "chrome/browser/ui/android/website_settings_popup_android.h" 161 #include "chrome/browser/ui/android/website_settings_popup_android.h"
161 #include "components/bookmarks/common/android/component_jni_registrar.h" 162 #include "components/bookmarks/common/android/component_jni_registrar.h"
162 #include "components/dom_distiller/android/component_jni_registrar.h" 163 #include "components/dom_distiller/android/component_jni_registrar.h"
163 #include "components/gcm_driver/android/component_jni_registrar.h" 164 #include "components/gcm_driver/android/component_jni_registrar.h"
164 #include "components/invalidation/impl/android/component_jni_registrar.h" 165 #include "components/invalidation/impl/android/component_jni_registrar.h"
165 #include "components/navigation_interception/component_jni_registrar.h" 166 #include "components/navigation_interception/component_jni_registrar.h"
166 #include "components/policy/core/browser/android/component_jni_registrar.h" 167 #include "components/policy/core/browser/android/component_jni_registrar.h"
167 #include "components/safe_json/android/component_jni_registrar.h" 168 #include "components/safe_json/android/component_jni_registrar.h"
168 #include "components/service_tab_launcher/component_jni_registrar.h" 169 #include "components/service_tab_launcher/component_jni_registrar.h"
169 #include "components/signin/core/browser/android/component_jni_registrar.h" 170 #include "components/signin/core/browser/android/component_jni_registrar.h"
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 {"TabState", RegisterTabState}, 369 {"TabState", RegisterTabState},
369 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, 370 {"TabStripSceneLayer", RegisterTabStripSceneLayer},
370 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, 371 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid},
371 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, 372 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
372 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 373 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
373 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 374 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
374 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 375 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
375 {"UmaSessionStats", RegisterUmaSessionStats}, 376 {"UmaSessionStats", RegisterUmaSessionStats},
376 {"UpdatePasswordInfoBar", UpdatePasswordInfoBar::Register}, 377 {"UpdatePasswordInfoBar", UpdatePasswordInfoBar::Register},
377 {"UrlUtilities", RegisterUrlUtilities}, 378 {"UrlUtilities", RegisterUrlUtilities},
379 {"UsbChooserAndroid", UsbChooserAndroid::Register},
378 {"Variations", variations::android::RegisterVariations}, 380 {"Variations", variations::android::RegisterVariations},
379 {"VariationsSeedBridge", variations::android::RegisterVariationsSeedBridge}, 381 {"VariationsSeedBridge", variations::android::RegisterVariationsSeedBridge},
380 {"VariationsSession", chrome::android::RegisterVariationsSession}, 382 {"VariationsSession", chrome::android::RegisterVariationsSession},
381 {"WarmupManager", RegisterWarmupManager}, 383 {"WarmupManager", RegisterWarmupManager},
382 {"WebappRegistry", WebappRegistry::RegisterWebappRegistry}, 384 {"WebappRegistry", WebappRegistry::RegisterWebappRegistry},
383 {"WebContentsFactory", RegisterWebContentsFactory}, 385 {"WebContentsFactory", RegisterWebContentsFactory},
384 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, 386 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
385 {"WebsiteSettingsPopupAndroid", 387 {"WebsiteSettingsPopupAndroid",
386 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, 388 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},
387 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 389 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
388 {"PrintingContext", 390 {"PrintingContext",
389 printing::PrintingContextAndroid::RegisterPrintingContext}, 391 printing::PrintingContextAndroid::RegisterPrintingContext},
390 #endif 392 #endif
391 }; 393 };
392 394
393 bool RegisterBrowserJNI(JNIEnv* env) { 395 bool RegisterBrowserJNI(JNIEnv* env) {
394 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 396 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
395 return RegisterNativeMethods(env, kChromeRegisteredMethods, 397 return RegisterNativeMethods(env, kChromeRegisteredMethods,
396 arraysize(kChromeRegisteredMethods)); 398 arraysize(kChromeRegisteredMethods));
397 } 399 }
398 400
399 } // namespace android 401 } // namespace android
400 } // namespace chrome 402 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698