chrome/chrome_browser.gypi - Issue 12220101: Minimal Chrome Frame with Aura.

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 12220101: Minimal Chrome Frame with Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert install_worker.cc to un-break win64 build Created 7 years, 10 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:

Index: chrome/chrome_browser.gypi

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

index c04d49365a98878eae0066f6be62cca011225f11..0acc599174f04d8c624b48fa78ea80aea5deae66 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -311,8 +311,8 @@

'browser/automation/automation_util.h',

'browser/automation/automation_window_tracker.cc',

'browser/automation/automation_window_tracker.h',

- 'browser/automation/chrome_frame_automation_provider.cc',

- 'browser/automation/chrome_frame_automation_provider.h',

+ 'browser/automation/chrome_frame_automation_provider_win.cc',

+ 'browser/automation/chrome_frame_automation_provider_win.h',

'browser/automation/testing_automation_provider.cc',

'browser/automation/testing_automation_provider.h',

'browser/automation/testing_automation_provider_aura.cc',

@@ -2576,9 +2576,6 @@

}],

['use_aura==1', {

'sources/': [

- ['exclude', '^browser/automation/automation_provider_win.cc'],

- ['exclude', '^browser/automation/chrome_frame_automation_provider.cc'],

- ['exclude', '^browser/automation/chrome_frame_automation_provider.h'],

['exclude', '^browser/automation/testing_automation_provider_win.cc'],

['exclude', '^browser/google/google_update_win.cc'],

['exclude', '^browser/google/google_update_win.h'],

@@ -2602,6 +2599,7 @@

'conditions': [

['OS=="win"', {

'sources/': [

+ ['exclude', '^browser/automation/automation_provider_aura.cc'],

['exclude', '^browser/background/background_mode_manager_aura.cc'],

['exclude', '^browser/fullscreen_ash.cc'],

['exclude', '^browser/lifetime/application_lifetime_win.cc'],

« no previous file with comments | « chrome/browser/ui/views/external_tab_container_win.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »