chrome/chrome.gyp - 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: chrome/chrome.gyp

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: Review feedback, UI feedback and moved Permission Settings strings into Android 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/android/java/res/layout/website_settings.xml ('K') | « chrome/browser/ui/android/website_settings_popup_android.cc ('k') | components/content_settings/core/common/content_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome.gyp

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp

index 392698b50d3b977024c6b8b1af49bb997649f998..20fe35c77b70fbad2d4a634d742724f70c92825e 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -584,6 +584,8 @@

'app_banner_metrics_ids_java',

'chrome_resources.gyp:chrome_strings',

'chrome_strings_grd',

+ 'content_setting_java',

+ 'content_settings_type_java',

'profile_account_management_metrics_java',

'page_info_connection_type_java',

'profile_sync_service_model_type_selection_java',

@@ -630,6 +632,22 @@

{

+ 'target_name': 'content_setting_java',

+ 'type': 'none',

+ 'variables': {

+ 'source_file': '../components/content_settings/core/common/content_settings.h',

+ },

+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],

+ },

+ {

+ 'target_name': 'content_settings_type_java',

+ 'type': 'none',

+ 'variables': {

+ 'source_file': '../components/content_settings/core/common/content_settings_types.h',

+ },

+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],

+ },

+ {

'target_name': 'page_info_connection_type_java',

'type': 'none',

'variables': {