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: Final rebase 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/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java ('K') | « chrome/browser/ui/website_settings/website_settings_unittest.cc ('k') | chrome/common/url_constants.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 2b6197b4321321b5fec9211edb85cc46d5126720..835be516ab205e9615cc5b0873c3e71aa04c1e6a 100644

--- a/chrome/chrome.gyp

+++ b/chrome/chrome.gyp

@@ -587,6 +587,8 @@

'chrome_strings_grd',

'chrome_version_java',

'profile_account_management_metrics_java',

+ 'content_setting_java',

+ 'content_settings_type_java',

'page_info_connection_type_java',

'profile_sync_service_model_type_selection_java',

'resource_id_java',

@@ -632,6 +634,24 @@

{

+ # GN: //chrome:content_setting_javagen

+ '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' ],

+ },

+ {

+ # GN: //chrome:content_settings_type_javagen

+ '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' ],

+ },

+ {

# GN: //chrome:page_info_connection_type_javagen

'target_name': 'page_info_connection_type_java',

'type': 'none',