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

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: use findbugs annotations; fix test 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/bookmarks/partner_bookmarks_reader.h" 16 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
16 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 17 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
17 #include "chrome/browser/android/chromium_application.h" 18 #include "chrome/browser/android/chromium_application.h"
18 #include "chrome/browser/android/compositor/layer_title_cache.h" 19 #include "chrome/browser/android/compositor/layer_title_cache.h"
19 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" 20 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
20 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h " 21 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h "
21 #include "chrome/browser/android/compositor/tab_content_manager.h" 22 #include "chrome/browser/android/compositor/tab_content_manager.h"
22 #include "chrome/browser/android/content_view_util.h" 23 #include "chrome/browser/android/content_view_util.h"
23 #include "chrome/browser/android/cookies/cookies_fetcher.h" 24 #include "chrome/browser/android/cookies/cookies_fetcher.h"
24 #include "chrome/browser/android/dev_tools_server.h" 25 #include "chrome/browser/android/dev_tools_server.h"
25 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h" 26 #include "chrome/browser/android/dom_distiller/feedback_reporter_android.h"
26 #include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h" 27 #include "chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h"
27 #include "chrome/browser/android/favicon_helper.h" 28 #include "chrome/browser/android/favicon_helper.h"
28 #include "chrome/browser/android/feature_utilities.h" 29 #include "chrome/browser/android/feature_utilities.h"
29 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" 30 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h"
30 #include "chrome/browser/android/foreign_session_helper.h" 31 #include "chrome/browser/android/foreign_session_helper.h"
31 #include "chrome/browser/android/intent_helper.h" 32 #include "chrome/browser/android/intent_helper.h"
32 #include "chrome/browser/android/logo_bridge.h" 33 #include "chrome/browser/android/logo_bridge.h"
33 #include "chrome/browser/android/most_visited_sites.h" 34 #include "chrome/browser/android/most_visited_sites.h"
34 #include "chrome/browser/android/new_tab_page_prefs.h" 35 #include "chrome/browser/android/new_tab_page_prefs.h"
35 #include "chrome/browser/android/omnibox/answers_image_bridge.h" 36 #include "chrome/browser/android/omnibox/answers_image_bridge.h"
36 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" 37 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h"
37 #include "chrome/browser/android/omnibox/omnibox_prerender.h" 38 #include "chrome/browser/android/omnibox/omnibox_prerender.h"
38 #include "chrome/browser/android/password_ui_view_android.h" 39 #include "chrome/browser/android/password_ui_view_android.h"
39 #include "chrome/browser/android/preferences/pref_service_bridge.h" 40 #include "chrome/browser/android/preferences/pref_service_bridge.h"
41 #include "chrome/browser/android/preferences/website_preference_bridge.h"
40 #include "chrome/browser/android/profiles/profile_downloader_android.h" 42 #include "chrome/browser/android/profiles/profile_downloader_android.h"
41 #include "chrome/browser/android/provider/chrome_browser_provider.h" 43 #include "chrome/browser/android/provider/chrome_browser_provider.h"
42 #include "chrome/browser/android/recently_closed_tabs_bridge.h" 44 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
43 #include "chrome/browser/android/shortcut_helper.h" 45 #include "chrome/browser/android/shortcut_helper.h"
44 #include "chrome/browser/android/signin/account_management_screen_helper.h" 46 #include "chrome/browser/android/signin/account_management_screen_helper.h"
45 #include "chrome/browser/android/signin/signin_manager_android.h" 47 #include "chrome/browser/android/signin/signin_manager_android.h"
46 #include "chrome/browser/android/tab_android.h" 48 #include "chrome/browser/android/tab_android.h"
47 #include "chrome/browser/android/tab_state.h" 49 #include "chrome/browser/android/tab_state.h"
48 #include "chrome/browser/android/uma_bridge.h" 50 #include "chrome/browser/android/uma_bridge.h"
49 #include "chrome/browser/android/uma_utils.h" 51 #include "chrome/browser/android/uma_utils.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 {"GeneratedPasswordSavedInfoBarDelegate", 174 {"GeneratedPasswordSavedInfoBarDelegate",
173 RegisterGeneratedPasswordSavedInfoBarDelegate}, 175 RegisterGeneratedPasswordSavedInfoBarDelegate},
174 {"InfoBarContainer", RegisterInfoBarContainer}, 176 {"InfoBarContainer", RegisterInfoBarContainer},
175 {"InvalidationServiceFactory", 177 {"InvalidationServiceFactory",
176 invalidation::InvalidationServiceFactoryAndroid::Register}, 178 invalidation::InvalidationServiceFactoryAndroid::Register},
177 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper}, 179 {"ShortcutHelper", ShortcutHelper::RegisterShortcutHelper},
178 {"IntentHelper", RegisterIntentHelper}, 180 {"IntentHelper", RegisterIntentHelper},
179 {"JavascriptAppModalDialog", 181 {"JavascriptAppModalDialog",
180 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog}, 182 JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog},
181 {"LayerTitleCache", chrome::android::RegisterLayerTitleCache}, 183 {"LayerTitleCache", chrome::android::RegisterLayerTitleCache},
184 {"LocationSettings", AppGoogleLocationSettingsHelper::Register},
182 {"LogoBridge", RegisterLogoBridge}, 185 {"LogoBridge", RegisterLogoBridge},
183 {"MostVisitedSites", MostVisitedSites::Register}, 186 {"MostVisitedSites", MostVisitedSites::Register},
184 {"NativeInfoBar", RegisterNativeInfoBar}, 187 {"NativeInfoBar", RegisterNativeInfoBar},
185 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup}, 188 {"NavigationPopup", NavigationPopup::RegisterNavigationPopup},
186 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs}, 189 {"NewTabPagePrefs", NewTabPagePrefs::RegisterNewTabPagePrefs},
187 {"NotificationUIManager", 190 {"NotificationUIManager",
188 NotificationUIManagerAndroid::RegisterNotificationUIManager}, 191 NotificationUIManagerAndroid::RegisterNotificationUIManager},
189 {"OmniboxPrerender", RegisterOmniboxPrerender}, 192 {"OmniboxPrerender", RegisterOmniboxPrerender},
190 {"OmniboxUrlEmphasizer", 193 {"OmniboxUrlEmphasizer",
191 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, 194 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
(...skipping 22 matching lines...) Expand all
214 {"TabModelJniBridge", TabModelJniBridge::Register}, 217 {"TabModelJniBridge", TabModelJniBridge::Register},
215 {"TabState", RegisterTabState}, 218 {"TabState", RegisterTabState},
216 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, 219 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
217 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 220 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
218 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 221 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
219 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 222 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
220 {"UmaBridge", RegisterUmaBridge}, 223 {"UmaBridge", RegisterUmaBridge},
221 {"UrlUtilities", RegisterUrlUtilities}, 224 {"UrlUtilities", RegisterUrlUtilities},
222 {"Variations", variations::android::RegisterVariations}, 225 {"Variations", variations::android::RegisterVariations},
223 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper}, 226 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper},
227 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
224 {"WebsiteSettingsPopupAndroid", 228 {"WebsiteSettingsPopupAndroid",
225 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, 229 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},
226 {"WebsiteSettingsPopupLegacyAndroid", 230 {"WebsiteSettingsPopupLegacyAndroid",
227 WebsiteSettingsPopupLegacyAndroid:: 231 WebsiteSettingsPopupLegacyAndroid::
228 RegisterWebsiteSettingsPopupLegacyAndroid}, 232 RegisterWebsiteSettingsPopupLegacyAndroid},
229 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 233 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
230 {"PrintingContext", 234 {"PrintingContext",
231 printing::PrintingContextAndroid::RegisterPrintingContext}, 235 printing::PrintingContextAndroid::RegisterPrintingContext},
232 #endif 236 #endif
233 }; 237 };
234 238
235 bool RegisterJni(JNIEnv* env) { 239 bool RegisterJni(JNIEnv* env) {
236 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 240 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
237 return RegisterNativeMethods(env, kChromeRegisteredMethods, 241 return RegisterNativeMethods(env, kChromeRegisteredMethods,
238 arraysize(kChromeRegisteredMethods)); 242 arraysize(kChromeRegisteredMethods));
239 } 243 }
240 244
241 } // namespace android 245 } // namespace android
242 } // namespace chrome 246 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698