components/content_settings/core/common/content_settings.h - Issue 620983002: Add Permissions to the PageInfo dialog on Android

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: components/content_settings/core/common/content_settings.h

Issue 620983002: Add Permissions to the PageInfo dialog on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page_info_dialog_shell_only_v2

Patch Set: Made copy button close dialog, moved connection message into java, fixed way internal pages are det… 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

« chrome/browser/ui/website_settings/website_settings.cc ('K') | « chrome/common/url_constants.cc ('k') | components/content_settings/core/common/content_settings_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/common/content_settings.h

diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h

index f35e9e1b14a064475110dc79ce13307a03c8c512..7c91b0c0fb0d89f2fd377dde9031a7bc4c654982 100644

--- a/components/content_settings/core/common/content_settings.h

+++ b/components/content_settings/core/common/content_settings.h

@@ -12,6 +12,8 @@

// Different settings that can be assigned for a particular content type. We

// give the user the ability to set these on a global and per-origin basis.

+// A Java counterpart will be generated for this enum.

+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser

enum ContentSetting {

CONTENT_SETTING_DEFAULT = 0,

CONTENT_SETTING_ALLOW,