chrome/chrome_browser.gypi - Issue 10083058: Aura/ash split: Remove hacks and get chrome linking without ash.

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 10083058: Aura/ash split: Remove hacks and get chrome linking without ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: The incremental change. Created 8 years, 8 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 f03e8d3fc8b49508b82b765476b817d511b6d57b..a0cbbb89c7d0812f2200c8b33b07628da1781c28 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1010,6 +1010,7 @@

'browser/first_run/upgrade_util_win.cc',

'browser/first_run/upgrade_util_win.h',

'browser/fullscreen.h',

+ 'browser/fullscreen_ash.cc',

'browser/fullscreen_aura.cc',

'browser/fullscreen_gtk.cc',

'browser/fullscreen_mac.mm',

@@ -3153,6 +3154,7 @@

'browser/ui/tab_modal_confirm_dialog_delegate.h',

'browser/ui/tabs/dock_info.cc',

'browser/ui/tabs/dock_info.h',

+ 'browser/ui/tabs/dock_info_ash.cc',

'browser/ui/tabs/dock_info_aura.cc',

'browser/ui/tabs/dock_info_gtk.cc',

'browser/ui/tabs/dock_info_mac.cc',

@@ -3482,7 +3484,7 @@

'browser/ui/views/select_file_dialog_extension.cc',

'browser/ui/views/select_file_dialog_extension.h',

'browser/ui/views/select_file_dialog_win.cc',

- 'browser/ui/views/ash/color_chooser_aura.cc',

+ 'browser/ui/views/color_chooser_aura.cc',

'browser/ui/views/color_chooser_win.cc',

'browser/ui/views/color_chooser_dialog.cc',

'browser/ui/views/color_chooser_dialog.h',

@@ -4816,6 +4818,7 @@

['include', '^browser/ui/views/chrome_views_delegate.cc'],

['include', '^browser/ui/views/collected_cookies_views.cc'],

['include', '^browser/ui/views/collected_cookies_views.h'],

+ ['include', '^browser/ui/views/color_chooser_aura.cc'],

['include', '^browser/ui/views/confirm_bubble_view.cc'],

['include', '^browser/ui/views/confirm_bubble_view.h'],

['include', '^browser/ui/views/constrained_html_delegate_views.cc'],

« no previous file with comments | « chrome/browser/ui/views/menu_model_adapter_test.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »