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

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

Issue 492843003: [Android] Upstream BrowserVersion.java and related native code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address reviewers' comments Created 6 years, 4 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
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"
11 #include "chrome/browser/android/accessibility_util.h" 11 #include "chrome/browser/android/accessibility_util.h"
12 #include "chrome/browser/android/banners/app_banner_manager.h" 12 #include "chrome/browser/android/banners/app_banner_manager.h"
13 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 13 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
14 #include "chrome/browser/android/browser_version.h"
14 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 15 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
15 #include "chrome/browser/android/chromium_application.h" 16 #include "chrome/browser/android/chromium_application.h"
16 #include "chrome/browser/android/content_view_util.h" 17 #include "chrome/browser/android/content_view_util.h"
17 #include "chrome/browser/android/dev_tools_server.h" 18 #include "chrome/browser/android/dev_tools_server.h"
18 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h" 19 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"
19 #include "chrome/browser/android/favicon_helper.h" 20 #include "chrome/browser/android/favicon_helper.h"
20 #include "chrome/browser/android/foreign_session_helper.h" 21 #include "chrome/browser/android/foreign_session_helper.h"
21 #include "chrome/browser/android/intent_helper.h" 22 #include "chrome/browser/android/intent_helper.h"
22 #include "chrome/browser/android/logo_bridge.h" 23 #include "chrome/browser/android/logo_bridge.h"
23 #include "chrome/browser/android/most_visited_sites.h" 24 #include "chrome/browser/android/most_visited_sites.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 autofill::AutofillDialogControllerAndroid:: 114 autofill::AutofillDialogControllerAndroid::
114 RegisterAutofillDialogControllerAndroid }, 115 RegisterAutofillDialogControllerAndroid },
115 { "AutofillDialogResult", 116 { "AutofillDialogResult",
116 autofill::AutofillDialogResult::RegisterAutofillDialogResult }, 117 autofill::AutofillDialogResult::RegisterAutofillDialogResult },
117 { "AutofillLoggerAndroid", 118 { "AutofillLoggerAndroid",
118 autofill::AutofillLoggerAndroid::Register }, 119 autofill::AutofillLoggerAndroid::Register },
119 { "AutofillPopup", 120 { "AutofillPopup",
120 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid }, 121 autofill::AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid },
121 { "AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register }, 122 { "AutoLoginDelegate", AutoLoginInfoBarDelegateAndroid::Register },
122 { "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge }, 123 { "BookmarksBridge", BookmarksBridge::RegisterBookmarksBridge },
124 { "BrowserVersion", RegisterBrowserVersion },
123 { "CertificateViewer", RegisterCertificateViewer }, 125 { "CertificateViewer", RegisterCertificateViewer },
124 { "ChromeBrowserProvider", 126 { "ChromeBrowserProvider",
125 ChromeBrowserProvider::RegisterChromeBrowserProvider }, 127 ChromeBrowserProvider::RegisterChromeBrowserProvider },
126 { "ChromeHttpAuthHandler", 128 { "ChromeHttpAuthHandler",
127 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, 129 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
128 { "ChromeWebContentsDelegateAndroid", 130 { "ChromeWebContentsDelegateAndroid",
129 RegisterChromeWebContentsDelegateAndroid }, 131 RegisterChromeWebContentsDelegateAndroid },
130 { "ChromiumApplication", 132 { "ChromiumApplication",
131 ChromiumApplication::RegisterBindings }, 133 ChromiumApplication::RegisterBindings },
132 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate }, 134 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate },
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 }; 197 };
196 198
197 bool RegisterJni(JNIEnv* env) { 199 bool RegisterJni(JNIEnv* env) {
198 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 200 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
199 return RegisterNativeMethods(env, kChromeRegisteredMethods, 201 return RegisterNativeMethods(env, kChromeRegisteredMethods,
200 arraysize(kChromeRegisteredMethods)); 202 arraysize(kChromeRegisteredMethods));
201 } 203 }
202 204
203 } // namespace android 205 } // namespace android
204 } // namespace chrome 206 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698