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

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

Issue 2458833005: Move printing defines to buildflag system. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/about_flags.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 #include "components/gcm_driver/instance_id/android/component_jni_registrar.h" 165 #include "components/gcm_driver/instance_id/android/component_jni_registrar.h"
166 #include "components/invalidation/impl/android/component_jni_registrar.h" 166 #include "components/invalidation/impl/android/component_jni_registrar.h"
167 #include "components/policy/core/browser/android/component_jni_registrar.h" 167 #include "components/policy/core/browser/android/component_jni_registrar.h"
168 #include "components/safe_json/android/component_jni_registrar.h" 168 #include "components/safe_json/android/component_jni_registrar.h"
169 #include "components/signin/core/browser/android/component_jni_registrar.h" 169 #include "components/signin/core/browser/android/component_jni_registrar.h"
170 #include "components/spellcheck/browser/android/component_jni_registrar.h" 170 #include "components/spellcheck/browser/android/component_jni_registrar.h"
171 #include "components/sync/android/sync_jni_registrar.h" 171 #include "components/sync/android/sync_jni_registrar.h"
172 #include "components/url_formatter/android/component_jni_registrar.h" 172 #include "components/url_formatter/android/component_jni_registrar.h"
173 #include "components/variations/android/component_jni_registrar.h" 173 #include "components/variations/android/component_jni_registrar.h"
174 #include "components/web_contents_delegate_android/component_jni_registrar.h" 174 #include "components/web_contents_delegate_android/component_jni_registrar.h"
175 #include "printing/features/features.h"
175 176
176 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 177 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)
177 #include "printing/printing_context_android.h" 178 #include "printing/printing_context_android.h"
178 #endif 179 #endif
179 180
180 #if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR) 181 #if defined(ENABLE_VR_SHELL) || defined(ENABLE_WEBVR)
181 #include "chrome/browser/android/vr_shell/vr_shell.h" 182 #include "chrome/browser/android/vr_shell/vr_shell.h"
182 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h" 183 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
183 #endif 184 #endif
184 185
185 #if !defined(OFFICIAL_BUILD) 186 #if !defined(OFFICIAL_BUILD)
186 #include "chrome/browser/android/offline_pages/evaluation/offline_page_evaluatio n_bridge.h" 187 #include "chrome/browser/android/offline_pages/evaluation/offline_page_evaluatio n_bridge.h"
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 {"VrShell", vr_shell::RegisterVrShell}, 398 {"VrShell", vr_shell::RegisterVrShell},
398 {"VrShellDelegate", vr_shell::RegisterVrShellDelegate}, 399 {"VrShellDelegate", vr_shell::RegisterVrShellDelegate},
399 #endif 400 #endif
400 {"WarmupManager", RegisterWarmupManager}, 401 {"WarmupManager", RegisterWarmupManager},
401 {"WebApkInstaller", WebApkInstaller::Register}, 402 {"WebApkInstaller", WebApkInstaller::Register},
402 {"WebApkUpdateManager", WebApkUpdateManager::Register}, 403 {"WebApkUpdateManager", WebApkUpdateManager::Register},
403 {"WebContentsFactory", RegisterWebContentsFactory}, 404 {"WebContentsFactory", RegisterWebContentsFactory},
404 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, 405 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
405 {"WebsiteSettingsPopupAndroid", 406 {"WebsiteSettingsPopupAndroid",
406 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, 407 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},
407 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 408 #if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)
408 {"PrintingContext", 409 {"PrintingContext",
409 printing::PrintingContextAndroid::RegisterPrintingContext}, 410 printing::PrintingContextAndroid::RegisterPrintingContext},
410 #endif 411 #endif
411 }; 412 };
412 413
413 bool RegisterBrowserJNI(JNIEnv* env) { 414 bool RegisterBrowserJNI(JNIEnv* env) {
414 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 415 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
415 return RegisterNativeMethods(env, kChromeRegisteredMethods, 416 return RegisterNativeMethods(env, kChromeRegisteredMethods,
416 arraysize(kChromeRegisteredMethods)); 417 arraysize(kChromeRegisteredMethods));
417 } 418 }
418 419
419 } // namespace android 420 } // namespace android
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698