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

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

Issue 850813002: Upstream Site Settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@location_settings_singleton
Patch Set: Created 5 years, 11 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"
11 #include "chrome/browser/android/accessibility_util.h" 11 #include "chrome/browser/android/accessibility_util.h"
12 #include "chrome/browser/android/app_google_location_settings_helper.h"
12 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" 13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"
13 #include "chrome/browser/android/banners/app_banner_manager.h" 14 #include "chrome/browser/android/banners/app_banner_manager.h"
14 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 15 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
15 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 16 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
16 #include "chrome/browser/android/chromium_application.h" 17 #include "chrome/browser/android/chromium_application.h"
17 #include "chrome/browser/android/compositor/layer_title_cache.h" 18 #include "chrome/browser/android/compositor/layer_title_cache.h"
18 #include "chrome/browser/android/compositor/tab_content_manager.h" 19 #include "chrome/browser/android/compositor/tab_content_manager.h"
19 #include "chrome/browser/android/content_view_util.h" 20 #include "chrome/browser/android/content_view_util.h"
20 #include "chrome/browser/android/cookies/cookies_fetcher.h" 21 #include "chrome/browser/android/cookies/cookies_fetcher.h"
21 #include "chrome/browser/android/dev_tools_server.h" 22 #include "chrome/browser/android/dev_tools_server.h"
22 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h" 23 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"
23 #include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h" 24 #include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h"
24 #include "chrome/browser/android/favicon_helper.h" 25 #include "chrome/browser/android/favicon_helper.h"
25 #include "chrome/browser/android/feature_utilities.h" 26 #include "chrome/browser/android/feature_utilities.h"
26 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" 27 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h"
27 #include "chrome/browser/android/foreign_session_helper.h" 28 #include "chrome/browser/android/foreign_session_helper.h"
28 #include "chrome/browser/android/intent_helper.h" 29 #include "chrome/browser/android/intent_helper.h"
29 #include "chrome/browser/android/logo_bridge.h" 30 #include "chrome/browser/android/logo_bridge.h"
30 #include "chrome/browser/android/most_visited_sites.h" 31 #include "chrome/browser/android/most_visited_sites.h"
31 #include "chrome/browser/android/new_tab_page_prefs.h" 32 #include "chrome/browser/android/new_tab_page_prefs.h"
32 #include "chrome/browser/android/omnibox/answers_image_bridge.h" 33 #include "chrome/browser/android/omnibox/answers_image_bridge.h"
33 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" 34 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h"
34 #include "chrome/browser/android/omnibox/omnibox_prerender.h" 35 #include "chrome/browser/android/omnibox/omnibox_prerender.h"
35 #include "chrome/browser/android/password_ui_view_android.h" 36 #include "chrome/browser/android/password_ui_view_android.h"
36 #include "chrome/browser/android/preferences/pref_service_bridge.h" 37 #include "chrome/browser/android/preferences/pref_service_bridge.h"
38 #include "chrome/browser/android/preferences/website_preference_bridge.h"
37 #include "chrome/browser/android/profiles/profile_downloader_android.h" 39 #include "chrome/browser/android/profiles/profile_downloader_android.h"
38 #include "chrome/browser/android/provider/chrome_browser_provider.h" 40 #include "chrome/browser/android/provider/chrome_browser_provider.h"
39 #include "chrome/browser/android/recently_closed_tabs_bridge.h" 41 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
40 #include "chrome/browser/android/shortcut_helper.h" 42 #include "chrome/browser/android/shortcut_helper.h"
41 #include "chrome/browser/android/signin/account_management_screen_helper.h" 43 #include "chrome/browser/android/signin/account_management_screen_helper.h"
42 #include "chrome/browser/android/signin/signin_manager_android.h" 44 #include "chrome/browser/android/signin/signin_manager_android.h"
43 #include "chrome/browser/android/tab_android.h" 45 #include "chrome/browser/android/tab_android.h"
44 #include "chrome/browser/android/tab_state.h" 46 #include "chrome/browser/android/tab_state.h"
45 #include "chrome/browser/android/uma_bridge.h" 47 #include "chrome/browser/android/uma_bridge.h"
46 #include "chrome/browser/android/uma_utils.h" 48 #include "chrome/browser/android/uma_utils.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 {"GeneratedPasswordSavedInfoBarDelegate", 171 {"GeneratedPasswordSavedInfoBarDelegate",
170 RegisterGeneratedPasswordSavedInfoBarDelegate}, 172 RegisterGeneratedPasswordSavedInfoBarDelegate},
171 {"InfoBarContainer", RegisterInfoBarContainer}, 173 {"InfoBarContainer", RegisterInfoBarContainer},
172 {"InvalidationServiceFactory", 174 {"InvalidationServiceFactory",
173 invalidation::InvalidationServiceFactoryAndroid::Register}, 175 invalidation::InvalidationServiceFactoryAndroid::Register},
174 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, 176 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper},
175 {"IntentHelper", RegisterIntentHelper}, 177 {"IntentHelper", RegisterIntentHelper},
176 {"JavascriptAppModalDialog", 178 {"JavascriptAppModalDialog",
177 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, 179 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog},
178 {"LayerTitleCache", chrome::android::RegisterLayerTitleCache}, 180 {"LayerTitleCache", chrome::android::RegisterLayerTitleCache},
181 {"LocationSettings", AppGoogleLocationSettingsHelper::Register},
179 {"LogoBridge", RegisterLogoBridge}, 182 {"LogoBridge", RegisterLogoBridge},
180 {"MostVisitedSites", MostVisitedSites::Register}, 183 {"MostVisitedSites", MostVisitedSites::Register},
181 {"NativeInfoBar", RegisterNativeInfoBar}, 184 {"NativeInfoBar", RegisterNativeInfoBar},
182 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, 185 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup},
183 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs}, 186 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs},
184 {"NotificationUIManager", 187 {"NotificationUIManager",
185 NotificationUIManagerAndroid::RegisterNotificationUIManager}, 188 NotificationUIManagerAndroid::RegisterNotificationUIManager},
186 {"OmniboxPrerender", RegisterOmniboxPrerender}, 189 {"OmniboxPrerender", RegisterOmniboxPrerender},
187 {"OmniboxUrlEmphasizer", 190 {"OmniboxUrlEmphasizer",
188 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, 191 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
(...skipping 18 matching lines...) Expand all
207 {"TabModelJniBridge", TabModelJniBridge::Register}, 210 {"TabModelJniBridge", TabModelJniBridge::Register},
208 {"TabState", RegisterTabState}, 211 {"TabState", RegisterTabState},
209 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, 212 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
210 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 213 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
211 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 214 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
212 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 215 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
213 {"UmaBridge", RegisterUmaBridge}, 216 {"UmaBridge", RegisterUmaBridge},
214 {"UrlUtilities", RegisterUrlUtilities}, 217 {"UrlUtilities", RegisterUrlUtilities},
215 {"Variations", variations::android::RegisterVariations}, 218 {"Variations", variations::android::RegisterVariations},
216 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper}, 219 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper},
220 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
217 {"WebsiteSettingsPopupAndroid", 221 {"WebsiteSettingsPopupAndroid",
218 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, 222 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},
219 {"WebsiteSettingsPopupLegacyAndroid", 223 {"WebsiteSettingsPopupLegacyAndroid",
220 WebsiteSettingsPopupLegacyAndroid:: 224 WebsiteSettingsPopupLegacyAndroid::
221 RegisterWebsiteSettingsPopupLegacyAndroid}, 225 RegisterWebsiteSettingsPopupLegacyAndroid},
222 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 226 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
223 {"PrintingContext", 227 {"PrintingContext",
224 printing::PrintingContextAndroid::RegisterPrintingContext}, 228 printing::PrintingContextAndroid::RegisterPrintingContext},
225 #endif 229 #endif
226 }; 230 };
227 231
228 bool RegisterJni(JNIEnv* env) { 232 bool RegisterJni(JNIEnv* env) {
229 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 233 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
230 return RegisterNativeMethods(env, kChromeRegisteredMethods, 234 return RegisterNativeMethods(env, kChromeRegisteredMethods,
231 arraysize(kChromeRegisteredMethods)); 235 arraysize(kChromeRegisteredMethods));
232 } 236 }
233 237
234 } // namespace android 238 } // namespace android
235 } // namespace chrome 239 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698