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

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

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 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
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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "chrome/browser/ui/android/website_settings_popup_android.h" 76 #include "chrome/browser/ui/android/website_settings_popup_android.h"
77 #include "chrome/browser/ui/android/website_settings_popup_legacy_android.h" 77 #include "chrome/browser/ui/android/website_settings_popup_legacy_android.h"
78 #include "components/bookmarks/common/android/component_jni_registrar.h" 78 #include "components/bookmarks/common/android/component_jni_registrar.h"
79 #include "components/dom_distiller/android/component_jni_registrar.h" 79 #include "components/dom_distiller/android/component_jni_registrar.h"
80 #include "components/gcm_driver/android/component_jni_registrar.h" 80 #include "components/gcm_driver/android/component_jni_registrar.h"
81 #include "components/invalidation/android/component_jni_registrar.h" 81 #include "components/invalidation/android/component_jni_registrar.h"
82 #include "components/navigation_interception/component_jni_registrar.h" 82 #include "components/navigation_interception/component_jni_registrar.h"
83 #include "components/variations/android/component_jni_registrar.h" 83 #include "components/variations/android/component_jni_registrar.h"
84 #include "components/web_contents_delegate_android/component_jni_registrar.h" 84 #include "components/web_contents_delegate_android/component_jni_registrar.h"
85 85
86 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) 86 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
87 #include "printing/printing_context_android.h" 87 #include "printing/printing_context_android.h"
88 #endif 88 #endif
89 89
90 bool RegisterCertificateViewer(JNIEnv* env); 90 bool RegisterCertificateViewer(JNIEnv* env);
91 91
92 namespace chrome { 92 namespace chrome {
93 namespace android { 93 namespace android {
94 94
95 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 95 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
96 // Register JNI for components we depend on. 96 // Register JNI for components we depend on.
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, 190 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register },
191 { "UmaBridge", RegisterUmaBridge }, 191 { "UmaBridge", RegisterUmaBridge },
192 { "UrlUtilities", RegisterUrlUtilities }, 192 { "UrlUtilities", RegisterUrlUtilities },
193 { "Variations", variations::android::RegisterVariations }, 193 { "Variations", variations::android::RegisterVariations },
194 { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper }, 194 { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper },
195 { "WebsiteSettingsPopupAndroid", 195 { "WebsiteSettingsPopupAndroid",
196 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, 196 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
197 { "WebsiteSettingsPopupLegacyAndroid", 197 { "WebsiteSettingsPopupLegacyAndroid",
198 WebsiteSettingsPopupLegacyAndroid:: 198 WebsiteSettingsPopupLegacyAndroid::
199 RegisterWebsiteSettingsPopupLegacyAndroid }, 199 RegisterWebsiteSettingsPopupLegacyAndroid },
200 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) 200 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
201 { "PrintingContext", 201 { "PrintingContext",
202 printing::PrintingContextAndroid::RegisterPrintingContext}, 202 printing::PrintingContextAndroid::RegisterPrintingContext},
203 #endif 203 #endif
204 }; 204 };
205 205
206 bool RegisterJni(JNIEnv* env) { 206 bool RegisterJni(JNIEnv* env) {
207 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 207 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
208 return RegisterNativeMethods(env, kChromeRegisteredMethods, 208 return RegisterNativeMethods(env, kChromeRegisteredMethods,
209 arraysize(kChromeRegisteredMethods)); 209 arraysize(kChromeRegisteredMethods));
210 } 210 }
211 211
212 } // namespace android 212 } // namespace android
213 } // namespace chrome 213 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698