chrome/chrome_browser.gypi - Issue 1560553002: Framelet Prototype 2016

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_browser.gypi

Issue 1560553002: Framelet Prototype 2016 Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased + Applied Brett's Windows + Fixed security issue Created 4 years, 11 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

Index: chrome/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index db7c848ecbce408f52c0e7504987c9c4d7bdca44..92bf127e1472903bb72cab3c70b89443a266a554 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -270,6 +270,12 @@

'browser/gpu/gpu_mode_manager.h',

'browser/gpu/three_d_api_observer.cc',

'browser/gpu/three_d_api_observer.h',

+ 'browser/guest_view/chrome_content_browser_client_guest_view_part.cc',

+ 'browser/guest_view/chrome_content_browser_client_guest_view_part.h',

+ 'browser/guest_view/chrome_guest_view_manager_delegate.cc',

+ 'browser/guest_view/chrome_guest_view_manager_delegate.h',

+ 'browser/guest_view/chrome_guest_view_message_filter.cc',

+ 'browser/guest_view/chrome_guest_view_message_filter.h',

'browser/icon_loader.cc',

'browser/icon_loader.h',

'browser/icon_loader_android.cc',

@@ -1549,8 +1555,8 @@

'browser/drive/drive_notification_manager_factory.h',

'browser/guest_view/app_view/chrome_app_view_guest_delegate.cc',

'browser/guest_view/app_view/chrome_app_view_guest_delegate.h',

- 'browser/guest_view/chrome_guest_view_manager_delegate.cc',

- 'browser/guest_view/chrome_guest_view_manager_delegate.h',

+ 'browser/guest_view/chrome_extensions_guest_view_manager_delegate.cc',

+ 'browser/guest_view/chrome_extensions_guest_view_manager_delegate.h',

'browser/guest_view/extension_options/chrome_extension_options_guest_delegate.cc',

'browser/guest_view/extension_options/chrome_extension_options_guest_delegate.h',

'browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.cc',

@@ -3149,6 +3155,7 @@

'../components/components.gyp:enhanced_bookmarks',

'../components/components.gyp:favicon_base',

'../components/components.gyp:favicon_core',

+ '../components/components.gyp:framelet_browser',

'../components/components.gyp:gcm_driver',

'../components/components.gyp:google_core_browser',

'../components/components.gyp:handoff',

@@ -3275,6 +3282,7 @@

'../components/components.gyp:error_page_common',

'../components/components.gyp:favicon_content',

'../components/components.gyp:flags_ui',

+ '../components/components.gyp:framelet_browser',

'../components/components.gyp:guest_view_browser',

'../components/components.gyp:history_content_browser',

'../components/components.gyp:keyed_service_content',

« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »