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

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

Issue 2252103002: Introduce ChromeVR to Chrome on Android (behind a build flag) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add comment as suggested by Daniel Created 4 years, 3 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
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/android/vr_shell/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 #include "components/signin/core/browser/android/component_jni_registrar.h" 160 #include "components/signin/core/browser/android/component_jni_registrar.h"
161 #include "components/spellcheck/browser/android/component_jni_registrar.h" 161 #include "components/spellcheck/browser/android/component_jni_registrar.h"
162 #include "components/sync/android/sync_jni_registrar.h" 162 #include "components/sync/android/sync_jni_registrar.h"
163 #include "components/variations/android/component_jni_registrar.h" 163 #include "components/variations/android/component_jni_registrar.h"
164 #include "components/web_contents_delegate_android/component_jni_registrar.h" 164 #include "components/web_contents_delegate_android/component_jni_registrar.h"
165 165
166 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 166 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
167 #include "printing/printing_context_android.h" 167 #include "printing/printing_context_android.h"
168 #endif 168 #endif
169 169
170 #if defined(ENABLE_VR_SHELL)
171 #include "chrome/browser/android/vr_shell/vr_shell.h"
172 #endif
173
170 namespace chrome { 174 namespace chrome {
171 namespace android { 175 namespace android {
172 176
173 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 177 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
174 // Register JNI for components we depend on. 178 // Register JNI for components we depend on.
175 {"AppMenuDragHelper", RegisterAppMenuDragHelper}, 179 {"AppMenuDragHelper", RegisterAppMenuDragHelper},
176 {"DomDistiller", dom_distiller::android::RegisterDomDistiller}, 180 {"DomDistiller", dom_distiller::android::RegisterDomDistiller},
177 {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate}, 181 {"ChromeDownloadDelegate", RegisterChromeDownloadDelegate},
178 {"GCMDriver", gcm::android::RegisterGCMDriverJni}, 182 {"GCMDriver", gcm::android::RegisterGCMDriverJni},
179 {"InstanceID", instance_id::android::RegisterInstanceIDJni}, 183 {"InstanceID", instance_id::android::RegisterInstanceIDJni},
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 351 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
348 {"ToolbarSceneLayer", RegisterToolbarSceneLayer}, 352 {"ToolbarSceneLayer", RegisterToolbarSceneLayer},
349 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 353 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
350 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 354 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
351 {"UmaSessionStats", RegisterUmaSessionStats}, 355 {"UmaSessionStats", RegisterUmaSessionStats},
352 {"UrlFilterBridge", UrlFilterBridge::Register}, 356 {"UrlFilterBridge", UrlFilterBridge::Register},
353 {"UrlUtilities", RegisterUrlUtilities}, 357 {"UrlUtilities", RegisterUrlUtilities},
354 {"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register}, 358 {"UsbChooserDialogAndroid", UsbChooserDialogAndroid::Register},
355 {"Variations", variations::android::RegisterVariations}, 359 {"Variations", variations::android::RegisterVariations},
356 {"VariationsSession", chrome::android::RegisterVariationsSession}, 360 {"VariationsSession", chrome::android::RegisterVariationsSession},
361 #if defined(ENABLE_VR_SHELL)
362 {"VrShell", vr_shell::RegisterVrShell},
363 #endif
357 {"WarmupManager", RegisterWarmupManager}, 364 {"WarmupManager", RegisterWarmupManager},
358 {"WebApkUpdateManager", WebApkUpdateManager::Register}, 365 {"WebApkUpdateManager", WebApkUpdateManager::Register},
359 {"WebappRegistry", WebappRegistry::RegisterWebappRegistry}, 366 {"WebappRegistry", WebappRegistry::RegisterWebappRegistry},
360 {"WebContentsFactory", RegisterWebContentsFactory}, 367 {"WebContentsFactory", RegisterWebContentsFactory},
361 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, 368 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
362 {"WebsiteSettingsPopupAndroid", 369 {"WebsiteSettingsPopupAndroid",
363 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, 370 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},
364 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 371 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
365 {"PrintingContext", 372 {"PrintingContext",
366 printing::PrintingContextAndroid::RegisterPrintingContext}, 373 printing::PrintingContextAndroid::RegisterPrintingContext},
367 #endif 374 #endif
368 }; 375 };
369 376
370 bool RegisterBrowserJNI(JNIEnv* env) { 377 bool RegisterBrowserJNI(JNIEnv* env) {
371 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 378 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
372 return RegisterNativeMethods(env, kChromeRegisteredMethods, 379 return RegisterNativeMethods(env, kChromeRegisteredMethods,
373 arraysize(kChromeRegisteredMethods)); 380 arraysize(kChromeRegisteredMethods));
374 } 381 }
375 382
376 } // namespace android 383 } // namespace android
377 } // namespace chrome 384 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/browser/android/vr_shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698