chrome/browser/android/chrome_jni_registrar.cc - Issue 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog

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 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed "is_android" guard on permission strings. Could have #defined out the function that uses th… Created 6 years, 2 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

« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/android/website_settings_popup_android.h » ('j') | chrome/browser/ui/website_settings/website_settings_ui.h » ('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 f0df9aff9ce2cac80bda923cb482cbec64ed4af2..936501ce822c50090e4a9f79eb70fba42a7a8fab 100644

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

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

@@ -72,6 +72,7 @@

#include "chrome/browser/ui/android/tab_model/tab_model_base.h"

#include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"

#include "chrome/browser/ui/android/website_settings_popup_android.h"

+#include "chrome/browser/ui/android/website_settings_popup_legacy_android.h"

#include "components/bookmarks/common/android/component_jni_registrar.h"

#include "components/dom_distiller/android/component_jni_registrar.h"

#include "components/gcm_driver/android/component_jni_registrar.h"

@@ -188,6 +189,9 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{ "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper },

{ "WebsiteSettingsPopupAndroid",

WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },

+ { "WebsiteSettingsPopupLegacyAndroid",

+ WebsiteSettingsPopupLegacyAndroid::

+ RegisterWebsiteSettingsPopupLegacyAndroid },

#if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING)

{ "PrintingContext",

printing::PrintingContextAndroid::RegisterPrintingContext},