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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win64 compile. Created 6 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/ui/aura/chrome_browser_main_extra_parts_aura.cc ('K') | « chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 4567f42caf378b536e1e1e3005b38e20745dd19e..6ac2732aedaba1a6c5f41ea7bc3b8e537b95f2b9 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2940,6 +2940,7 @@
'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',
@@ -2997,11 +2998,6 @@
'../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'],
« chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc ('K') | « chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698