| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'variables': { | 6   'variables': { | 
| 7     'chromium_code': 1, | 7     'chromium_code': 1, | 
| 8     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 8     'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 
| 9   }, | 9   }, | 
| 10   'includes': [ | 10   'includes': [ | 
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 613           'dependencies': [ | 613           'dependencies': [ | 
| 614             '../build/linux/system.gyp:ibus', | 614             '../build/linux/system.gyp:ibus', | 
| 615           ], | 615           ], | 
| 616         }], | 616         }], | 
| 617         ['OS=="win"', { | 617         ['OS=="win"', { | 
| 618           'sources/': [ | 618           'sources/': [ | 
| 619             # TODO(win_ash): implement DragDropController::StartDragAndDrop | 619             # TODO(win_ash): implement DragDropController::StartDragAndDrop | 
| 620             ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], | 620             ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], | 
| 621           # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690
     6 | 621           # TODO(zork): fix this test to build on Windows. See: crosbug.com/2690
     6 | 
| 622             ['exclude', 'focus_cycler_unittest.cc'], | 622             ['exclude', 'focus_cycler_unittest.cc'], | 
|  | 623             # All tests for multiple displays: not supported on Windows Ash. | 
|  | 624             ['exclude', 'wm/drag_window_resizer_unittest.cc'], | 
| 623           ], | 625           ], | 
| 624         }], | 626         }], | 
| 625         ['OS=="mac"', { | 627         ['OS=="mac"', { | 
| 626           'sources/': [ | 628           'sources/': [ | 
| 627             ['exclude', 'accelerators/accelerator_controller_unittest.cc'], | 629             ['exclude', 'accelerators/accelerator_controller_unittest.cc'], | 
| 628             ['exclude', 'accelerators/accelerator_filter_unittest.cc'], | 630             ['exclude', 'accelerators/accelerator_filter_unittest.cc'], | 
| 629             ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc']
     , | 631             ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc']
     , | 
| 630             ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], | 632             ['exclude', 'drag_drop/drag_drop_controller_unittest.cc'], | 
| 631             ['exclude', 'tooltips/tooltip_controller_unittest.cc'], | 633             ['exclude', 'tooltips/tooltip_controller_unittest.cc'], | 
| 632           ], | 634           ], | 
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 730             'shell/cocoa/app-Info.plist', | 732             'shell/cocoa/app-Info.plist', | 
| 731           ], | 733           ], | 
| 732           'xcode_settings': { | 734           'xcode_settings': { | 
| 733             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', | 735             'INFOPLIST_FILE': 'shell/cocoa/app-Info.plist', | 
| 734           }, | 736           }, | 
| 735         }], | 737         }], | 
| 736       ], | 738       ], | 
| 737     }, | 739     }, | 
| 738   ], | 740   ], | 
| 739 } | 741 } | 
| OLD | NEW | 
|---|