chrome/browser/android/chrome_jni_registrar.cc - Issue 927763003: Move website settings fetching from WebsitePreferences to new WebsitePermissionFetcher.

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 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 side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java ('k') | chrome/browser/android/preferences/website_address.h » ('j') | chrome/browser/android/preferences/website_address.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 88ef2bc66314c3fee9bcb926e50060ad99894fed..e4e1e47f5c7c8629d61123211b9328ed1a262856 100644

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

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

@@ -40,6 +40,7 @@

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

#include "chrome/browser/android/preferences/autofill/autofill_profile_bridge.h"

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

+#include "chrome/browser/android/preferences/website_address.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"

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

{"UrlUtilities", RegisterUrlUtilities},

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

{"VoiceSearchTabHelper", RegisterVoiceSearchTabHelper},

+ {"WebsiteAddress", RegisterWebsiteAddress},

{"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},

{"WebsiteSettingsPopupAndroid",

WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},