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

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

Issue 285203005: Hook components/gcm_driver up to JNI Generator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/android/accessibility_util.h" 10 #include "chrome/browser/android/accessibility_util.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/ui/android/infobars/save_password_infobar.h" 60 #include "chrome/browser/ui/android/infobars/save_password_infobar.h"
61 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 61 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
62 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 62 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
63 #include "chrome/browser/ui/android/navigation_popup.h" 63 #include "chrome/browser/ui/android/navigation_popup.h"
64 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 64 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
65 #include "chrome/browser/ui/android/tab_model/tab_model_base.h" 65 #include "chrome/browser/ui/android/tab_model/tab_model_base.h"
66 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 66 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
67 #include "chrome/browser/ui/android/website_settings_popup_android.h" 67 #include "chrome/browser/ui/android/website_settings_popup_android.h"
68 #include "components/autofill/core/browser/android/component_jni_registrar.h" 68 #include "components/autofill/core/browser/android/component_jni_registrar.h"
69 #include "components/dom_distiller/android/component_jni_registrar.h" 69 #include "components/dom_distiller/android/component_jni_registrar.h"
70 #include "components/gcm_driver/android/component_jni_registrar.h"
70 #include "components/navigation_interception/component_jni_registrar.h" 71 #include "components/navigation_interception/component_jni_registrar.h"
71 #include "components/web_contents_delegate_android/component_jni_registrar.h" 72 #include "components/web_contents_delegate_android/component_jni_registrar.h"
72 73
73 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) 74 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING)
74 #include "printing/printing_context_android.h" 75 #include "printing/printing_context_android.h"
75 #endif 76 #endif
76 77
77 bool RegisterCertificateViewer(JNIEnv* env); 78 bool RegisterCertificateViewer(JNIEnv* env);
78 79
79 namespace chrome { 80 namespace chrome {
80 namespace android { 81 namespace android {
81 82
82 static base::android::RegistrationMethod kChromeRegisteredMethods[] = { 83 static base::android::RegistrationMethod kChromeRegisteredMethods[] = {
83 // Register JNI for components we depend on. 84 // Register JNI for components we depend on.
84 { "DomDistiller", dom_distiller::android::RegisterDomDistiller }, 85 { "DomDistiller", dom_distiller::android::RegisterDomDistiller },
86 { "GCMDriver", gcm::android::RegisterGCMDriverJni },
85 { "NavigationInterception", 87 { "NavigationInterception",
86 navigation_interception::RegisterNavigationInterceptionJni }, 88 navigation_interception::RegisterNavigationInterceptionJni },
87 { "WebContentsDelegateAndroid", 89 { "WebContentsDelegateAndroid",
88 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni }, 90 web_contents_delegate_android::RegisterWebContentsDelegateAndroidJni },
89 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni }, 91 { "RegisterAuxiliaryProfileLoader", autofill::RegisterAutofillAndroidJni },
90 // Register JNI for chrome classes. 92 // Register JNI for chrome classes.
91 { "AccessibilityUtils", AccessibilityUtil::Register }, 93 { "AccessibilityUtils", AccessibilityUtil::Register },
92 { "AccountManagementScreenHelper", AccountManagementScreenHelper::Register }, 94 { "AccountManagementScreenHelper", AccountManagementScreenHelper::Register },
93 { "AndroidProfileOAuth2TokenService", 95 { "AndroidProfileOAuth2TokenService",
94 AndroidProfileOAuth2TokenService::Register }, 96 AndroidProfileOAuth2TokenService::Register },
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 }; 175 };
174 176
175 bool RegisterJni(JNIEnv* env) { 177 bool RegisterJni(JNIEnv* env) {
176 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 178 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
177 return RegisterNativeMethods(env, kChromeRegisteredMethods, 179 return RegisterNativeMethods(env, kChromeRegisteredMethods,
178 arraysize(kChromeRegisteredMethods)); 180 arraysize(kChromeRegisteredMethods));
179 } 181 }
180 182
181 } // namespace android 183 } // namespace android
182 } // namespace chrome 184 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698