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

Unified Diff: trunk/src/ash/ash.gyp

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
« no previous file with comments | « trunk/src/ash/accelerators/magnifier_key_scroller.cc ('k') | trunk/src/ash/ash_constants.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/ash.gyp
===================================================================
--- trunk/src/ash/ash.gyp (revision 269901)
+++ trunk/src/ash/ash.gyp (working copy)
@@ -1017,7 +1017,7 @@
'wm/workspace_controller_unittest.cc',
],
'conditions': [
- ['chromeos==0', {
+ ['OS=="win"', {
'sources/': [
# TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
['exclude', 'focus_cycler_unittest.cc'],
« no previous file with comments | « trunk/src/ash/accelerators/magnifier_key_scroller.cc ('k') | trunk/src/ash/ash_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698