chrome/chrome_browser.gypi - Issue 8992034: Merge 114608, 115692 to 963 (M17) branch.

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 8992034: Merge 114608, 115692 to 963 (M17) branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/

Patch Set: rebasing, checking for diffs before merge Created 9 years 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 ced1b0fdb516493413e42481ff55e446f96ed956..65e7bc74a48799648ec96eb2f59e8494de74869d 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -3922,12 +3922,12 @@

'browser/ui/webui/ssl_client_certificate_selector_webui.h',

'browser/ui/webui/sync_internals_ui.cc',

'browser/ui/webui/sync_internals_ui.h',

- 'browser/ui/webui/sync_promo_handler.cc',

- 'browser/ui/webui/sync_promo_handler.h',

- 'browser/ui/webui/sync_promo_trial.cc',

- 'browser/ui/webui/sync_promo_trial.h',

- 'browser/ui/webui/sync_promo_ui.cc',

- 'browser/ui/webui/sync_promo_ui.h',

+ 'browser/ui/webui/sync_promo/sync_promo_handler.cc',

+ 'browser/ui/webui/sync_promo/sync_promo_handler.h',

+ 'browser/ui/webui/sync_promo/sync_promo_trial.cc',

+ 'browser/ui/webui/sync_promo/sync_promo_trial.h',

+ 'browser/ui/webui/sync_promo/sync_promo_ui.cc',

+ 'browser/ui/webui/sync_promo/sync_promo_ui.h',

'browser/ui/webui/sync_setup_handler.cc',

'browser/ui/webui/sync_setup_handler.h',

'browser/ui/webui/task_manager_dialog.cc',

« no previous file with comments | « chrome/browser/ui/webui/sync_setup_handler.cc ('k') | no next file » | no next file with comments »