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

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

Issue 666063002: [Android] Upstream ChromeNativePreferences as PrefServiceBridge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
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 10 matching lines...) Expand all
21 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" 21 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h"
22 #include "chrome/browser/android/foreign_session_helper.h" 22 #include "chrome/browser/android/foreign_session_helper.h"
23 #include "chrome/browser/android/intent_helper.h" 23 #include "chrome/browser/android/intent_helper.h"
24 #include "chrome/browser/android/logo_bridge.h" 24 #include "chrome/browser/android/logo_bridge.h"
25 #include "chrome/browser/android/most_visited_sites.h" 25 #include "chrome/browser/android/most_visited_sites.h"
26 #include "chrome/browser/android/new_tab_page_prefs.h" 26 #include "chrome/browser/android/new_tab_page_prefs.h"
27 #include "chrome/browser/android/omnibox/answers_image_bridge.h" 27 #include "chrome/browser/android/omnibox/answers_image_bridge.h"
28 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" 28 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h"
29 #include "chrome/browser/android/omnibox/omnibox_prerender.h" 29 #include "chrome/browser/android/omnibox/omnibox_prerender.h"
30 #include "chrome/browser/android/password_ui_view_android.h" 30 #include "chrome/browser/android/password_ui_view_android.h"
31 #include "chrome/browser/android/preferences/pref_service_bridge.h"
31 #include "chrome/browser/android/profiles/profile_downloader_android.h" 32 #include "chrome/browser/android/profiles/profile_downloader_android.h"
32 #include "chrome/browser/android/provider/chrome_browser_provider.h" 33 #include "chrome/browser/android/provider/chrome_browser_provider.h"
33 #include "chrome/browser/android/recently_closed_tabs_bridge.h" 34 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
34 #include "chrome/browser/android/shortcut_helper.h" 35 #include "chrome/browser/android/shortcut_helper.h"
35 #include "chrome/browser/android/signin/account_management_screen_helper.h" 36 #include "chrome/browser/android/signin/account_management_screen_helper.h"
36 #include "chrome/browser/android/signin/signin_manager_android.h" 37 #include "chrome/browser/android/signin/signin_manager_android.h"
37 #include "chrome/browser/android/tab_android.h" 38 #include "chrome/browser/android/tab_android.h"
38 #include "chrome/browser/android/uma_bridge.h" 39 #include "chrome/browser/android/uma_bridge.h"
39 #include "chrome/browser/android/uma_utils.h" 40 #include "chrome/browser/android/uma_utils.h"
40 #include "chrome/browser/android/url_utilities.h" 41 #include "chrome/browser/android/url_utilities.h"
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 { "NativeInfoBar", RegisterNativeInfoBar }, 162 { "NativeInfoBar", RegisterNativeInfoBar },
162 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup }, 163 { "NavigationPopup", NavigationPopup::RegisterNavigationPopup },
163 { "NewTabPagePrefs", 164 { "NewTabPagePrefs",
164 NewTabPagePrefs::RegisterNewTabPagePrefs }, 165 NewTabPagePrefs::RegisterNewTabPagePrefs },
165 { "OmniboxPrerender", RegisterOmniboxPrerender }, 166 { "OmniboxPrerender", RegisterOmniboxPrerender },
166 { "OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil }, 167 { "OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil },
167 { "PasswordUIViewAndroid", 168 { "PasswordUIViewAndroid",
168 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid }, 169 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid },
169 { "PersonalDataManagerAndroid", 170 { "PersonalDataManagerAndroid",
170 autofill::PersonalDataManagerAndroid::Register }, 171 autofill::PersonalDataManagerAndroid::Register },
172 { "PrefServiceBridge", RegisterPrefServiceBridge },
171 { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid }, 173 { "ProfileAndroid", ProfileAndroid::RegisterProfileAndroid },
172 { "ProfileDownloaderAndroid", ProfileDownloaderAndroid::Register }, 174 { "ProfileDownloaderAndroid", ProfileDownloaderAndroid::Register },
173 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, 175 { "ProfileSyncService", ProfileSyncServiceAndroid::Register },
174 { "RecentlyClosedBridge", RecentlyClosedTabsBridge::Register }, 176 { "RecentlyClosedBridge", RecentlyClosedTabsBridge::Register },
175 { "SigninManager", SigninManagerAndroid::Register }, 177 { "SigninManager", SigninManagerAndroid::Register },
176 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, 178 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
177 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid }, 179 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid },
178 { "StartupMetricUtils", RegisterStartupMetricUtils }, 180 { "StartupMetricUtils", RegisterStartupMetricUtils },
179 { "TabAndroid", TabAndroid::RegisterTabAndroid }, 181 { "TabAndroid", TabAndroid::RegisterTabAndroid },
180 { "TabModelBase", RegisterTabModelBase}, 182 { "TabModelBase", RegisterTabModelBase},
(...skipping 18 matching lines...) Expand all
199 }; 201 };
200 202
201 bool RegisterJni(JNIEnv* env) { 203 bool RegisterJni(JNIEnv* env) {
202 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 204 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
203 return RegisterNativeMethods(env, kChromeRegisteredMethods, 205 return RegisterNativeMethods(env, kChromeRegisteredMethods,
204 arraysize(kChromeRegisteredMethods)); 206 arraysize(kChromeRegisteredMethods));
205 } 207 }
206 208
207 } // namespace android 209 } // namespace android
208 } // namespace chrome 210 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698