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

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

Issue 927763003: Move website settings fetching from WebsitePreferences to new WebsitePermissionFetcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to WebsiteSettingsPopup. Created 5 years, 10 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/trace_event/trace_event.h" 9 #include "base/trace_event/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 22 matching lines...) Expand all
33 #include "chrome/browser/android/location_settings_impl.h" 33 #include "chrome/browser/android/location_settings_impl.h"
34 #include "chrome/browser/android/logo_bridge.h" 34 #include "chrome/browser/android/logo_bridge.h"
35 #include "chrome/browser/android/most_visited_sites.h" 35 #include "chrome/browser/android/most_visited_sites.h"
36 #include "chrome/browser/android/new_tab_page_prefs.h" 36 #include "chrome/browser/android/new_tab_page_prefs.h"
37 #include "chrome/browser/android/omnibox/answers_image_bridge.h" 37 #include "chrome/browser/android/omnibox/answers_image_bridge.h"
38 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h" 38 #include "chrome/browser/android/omnibox/autocomplete_controller_android.h"
39 #include "chrome/browser/android/omnibox/omnibox_prerender.h" 39 #include "chrome/browser/android/omnibox/omnibox_prerender.h"
40 #include "chrome/browser/android/password_ui_view_android.h" 40 #include "chrome/browser/android/password_ui_view_android.h"
41 #include "chrome/browser/android/preferences/autofill/autofill_profile_bridge.h" 41 #include "chrome/browser/android/preferences/autofill/autofill_profile_bridge.h"
42 #include "chrome/browser/android/preferences/pref_service_bridge.h" 42 #include "chrome/browser/android/preferences/pref_service_bridge.h"
43 #include "chrome/browser/android/preferences/website_address.h"
43 #include "chrome/browser/android/preferences/website_preference_bridge.h" 44 #include "chrome/browser/android/preferences/website_preference_bridge.h"
44 #include "chrome/browser/android/profiles/profile_downloader_android.h" 45 #include "chrome/browser/android/profiles/profile_downloader_android.h"
45 #include "chrome/browser/android/provider/chrome_browser_provider.h" 46 #include "chrome/browser/android/provider/chrome_browser_provider.h"
46 #include "chrome/browser/android/recently_closed_tabs_bridge.h" 47 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
47 #include "chrome/browser/android/service_tab_launcher.h" 48 #include "chrome/browser/android/service_tab_launcher.h"
48 #include "chrome/browser/android/shortcut_helper.h" 49 #include "chrome/browser/android/shortcut_helper.h"
49 #include "chrome/browser/android/signin/account_management_screen_helper.h" 50 #include "chrome/browser/android/signin/account_management_screen_helper.h"
50 #include "chrome/browser/android/signin/signin_manager_android.h" 51 #include "chrome/browser/android/signin/signin_manager_android.h"
51 #include "chrome/browser/android/tab_android.h" 52 #include "chrome/browser/android/tab_android.h"
52 #include "chrome/browser/android/tab_state.h" 53 #include "chrome/browser/android/tab_state.h"
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 {"TabModelJniBridge", TabModelJniBridge::Register}, 224 {"TabModelJniBridge", TabModelJniBridge::Register},
224 {"TabState", RegisterTabState}, 225 {"TabState", RegisterTabState},
225 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, 226 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
226 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 227 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
227 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 228 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
228 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 229 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
229 {"UmaBridge", RegisterUmaBridge}, 230 {"UmaBridge", RegisterUmaBridge},
230 {"UrlUtilities", RegisterUrlUtilities}, 231 {"UrlUtilities", RegisterUrlUtilities},
231 {"Variations", variations::android::RegisterVariations}, 232 {"Variations", variations::android::RegisterVariations},
232 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper}, 233 {"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper},
234 {"WebsiteAddress", RegisterWebsiteAddress},
233 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge}, 235 {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},
234 {"WebsiteSettingsPopupAndroid", 236 {"WebsiteSettingsPopupAndroid",
235 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid}, 237 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},
236 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW) 238 #if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)
237 {"PrintingContext", 239 {"PrintingContext",
238 printing::PrintingContextAndroid::RegisterPrintingContext}, 240 printing::PrintingContextAndroid::RegisterPrintingContext},
239 #endif 241 #endif
240 }; 242 };
241 243
242 bool RegisterJni(JNIEnv* env) { 244 bool RegisterJni(JNIEnv* env) {
243 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 245 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
244 return RegisterNativeMethods(env, kChromeRegisteredMethods, 246 return RegisterNativeMethods(env, kChromeRegisteredMethods,
245 arraysize(kChromeRegisteredMethods)); 247 arraysize(kChromeRegisteredMethods));
246 } 248 }
247 249
248 } // namespace android 250 } // namespace android
249 } // namespace chrome 251 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698