chrome/chrome_browser.gypi - Issue 270383007: linux_aura: Compile ash into chrome. - Code Review

Chromium Code Reviews

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

(1615)

My Issues | Starred Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 270383007: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « 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') | Hide Comments ('s')

Index: chrome/chrome_browser.gypi

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

index 0ec1448dce7e6d76241d962777bad31cf6f46ed7..398d89d18d39827564e96575c92d98c6925271e7 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

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

@@ -3012,11 +3013,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'],

« no previous file with comments | « 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