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

Patch Set: 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

« chrome/browser/chrome_browser_main_extra_parts_aura.cc ('K') | « chrome/browser/ui/views/color_chooser_aura.cc ('k') | ui/aura/aura.gyp » ('j') | ui/aura/desktop/desktop_stacking_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

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

index 1b8f255d4166663b56ef25c17bf357886b748596..cd4696ed59181f87e8e10d790c82ed5180a8ebf5 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1014,6 +1014,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',

@@ -3169,6 +3170,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',

@@ -3497,7 +3499,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',

@@ -4811,6 +4813,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'],