chrome/browser/android/chrome_jni_registrar.cc - Issue 850813002: Upstream Site Settings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 548d8d3ad6c370d5e5b2589a2b2e6ae552ab4c09..5cfae150d072b849349e07f0677a43f9359d1ea7 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -9,6 +9,7 @@

#include "base/debug/trace_event.h"

#include "chrome/browser/android/accessibility/font_size_prefs_android.h"

#include "chrome/browser/android/accessibility_util.h"

+#include "chrome/browser/android/app_google_location_settings_helper.h"

#include "chrome/browser/android/appmenu/app_menu_drag_helper.h"

#include "chrome/browser/android/banners/app_banner_manager.h"

#include "chrome/browser/android/bookmarks/bookmarks_bridge.h"

@@ -37,6 +38,7 @@

#include "chrome/browser/android/omnibox/omnibox_prerender.h"

#include "chrome/browser/android/password_ui_view_android.h"

#include "chrome/browser/android/preferences/pref_service_bridge.h"

+#include "chrome/browser/android/preferences/website_preference_bridge.h"

#include "chrome/browser/android/profiles/profile_downloader_android.h"

#include "chrome/browser/android/provider/chrome_browser_provider.h"

#include "chrome/browser/android/recently_closed_tabs_bridge.h"

@@ -179,6 +181,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"JavascriptAppModalDialog",

JavascriptAppModalDialogAndroid::RegisterJavascriptAppModalDialog},

{"LayerTitleCache", chrome::android::RegisterLayerTitleCache},

+ {"LocationSettings", AppGoogleLocationSettingsHelper::Register},

{"LogoBridge", RegisterLogoBridge},

{"MostVisitedSites", MostVisitedSites::Register},

{"NativeInfoBar", RegisterNativeInfoBar},

@@ -221,6 +224,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"UrlUtilities", RegisterUrlUtilities},

{"Variations", variations::android::RegisterVariations},

{"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper},

+ {"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},

{"WebsiteSettingsPopupAndroid",

WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},

{"WebsiteSettingsPopupLegacyAndroid",