Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: trunk/src/chrome/chrome_browser.gypi

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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: trunk/src/chrome/chrome_browser.gypi
===================================================================
--- trunk/src/chrome/chrome_browser.gypi (revision 269901)
+++ trunk/src/chrome/chrome_browser.gypi (working copy)
@@ -2953,7 +2953,6 @@
'browser/first_run/upgrade_util.cc',
'browser/first_run/upgrade_util.h',
'browser/first_run/upgrade_util_linux.cc',
- 'browser/fullscreen_aurax11.cc',
'browser/icon_loader_auralinux.cc',
'browser/idle_linux.cc',
'browser/password_manager/native_backend_gnome_x.cc',
@@ -3013,6 +3012,11 @@
'../build/linux/system.gyp:gnome_keyring',
],
}],
+ ['use_ash==1', {
+ 'sources!': [
+ 'browser/fullscreen_aurax11.cc',
+ ],
+ }],
['use_aura==1', {
'sources/': [
['exclude', '^browser/lifetime/application_lifetime_stub.cc'],
« no previous file with comments | « trunk/src/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | trunk/src/chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698