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

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

Issue 2840563004: Move vr features.gni into its own directory. (Closed)
Patch Set: Update references to vr/features.h Created 3 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/android/DEPS ('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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 #include "components/policy/core/browser/android/component_jni_registrar.h" 183 #include "components/policy/core/browser/android/component_jni_registrar.h"
184 #include "components/safe_browsing_db/android/jni_registrar.h" 184 #include "components/safe_browsing_db/android/jni_registrar.h"
185 #include "components/safe_json/android/component_jni_registrar.h" 185 #include "components/safe_json/android/component_jni_registrar.h"
186 #include "components/signin/core/browser/android/component_jni_registrar.h" 186 #include "components/signin/core/browser/android/component_jni_registrar.h"
187 #include "components/spellcheck/browser/android/component_jni_registrar.h" 187 #include "components/spellcheck/browser/android/component_jni_registrar.h"
188 #include "components/spellcheck/spellcheck_build_features.h" 188 #include "components/spellcheck/spellcheck_build_features.h"
189 #include "components/sync/android/sync_jni_registrar.h" 189 #include "components/sync/android/sync_jni_registrar.h"
190 #include "components/url_formatter/android/component_jni_registrar.h" 190 #include "components/url_formatter/android/component_jni_registrar.h"
191 #include "components/variations/android/component_jni_registrar.h" 191 #include "components/variations/android/component_jni_registrar.h"
192 #include "components/web_contents_delegate_android/component_jni_registrar.h" 192 #include "components/web_contents_delegate_android/component_jni_registrar.h"
193 #include "device/vr/features.h" 193 #include "device/vr/features/features.h"
194 #include "printing/features/features.h" 194 #include "printing/features/features.h"
195 195
196 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW) 196 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)
197 #include "printing/printing_context_android.h" 197 #include "printing/printing_context_android.h"
198 #endif 198 #endif
199 199
200 #if BUILDFLAG(ENABLE_VR) 200 #if BUILDFLAG(ENABLE_VR)
201 #include "chrome/browser/android/vr_shell/vr_shell.h" 201 #include "chrome/browser/android/vr_shell/vr_shell.h"
202 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h" 202 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
203 #include "third_party/gvr-android-sdk/display_synchronizer_jni.h" 203 #include "third_party/gvr-android-sdk/display_synchronizer_jni.h"
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 #endif 455 #endif
456 }; 456 };
457 457
458 bool RegisterBrowserJNI(JNIEnv* env) { 458 bool RegisterBrowserJNI(JNIEnv* env) {
459 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 459 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
460 return RegisterNativeMethods(env, kChromeRegisteredMethods, 460 return RegisterNativeMethods(env, kChromeRegisteredMethods,
461 arraysize(kChromeRegisteredMethods)); 461 arraysize(kChromeRegisteredMethods));
462 } 462 }
463 463
464 } // namespace android 464 } // namespace android
OLDNEW
« no previous file with comments | « chrome/browser/android/DEPS ('k') | chrome/browser/android/vr_shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698