OLD | NEW |
---|---|
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'variables' : { | 5 'variables' : { |
6 'pyautolib_sources': [ | 6 'pyautolib_sources': [ |
7 'app/chrome_command_ids.h', | 7 'app/chrome_command_ids.h', |
8 'app/chrome_dll_resource.h', | 8 'app/chrome_dll_resource.h', |
9 'common/automation_constants.h', | 9 'common/automation_constants.h', |
10 'common/pref_names.cc', | 10 'common/pref_names.cc', |
(...skipping 1864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1875 'dependencies': [ | 1875 'dependencies': [ |
1876 '<(allocator_target)', | 1876 '<(allocator_target)', |
1877 ], | 1877 ], |
1878 }], | 1878 }], |
1879 ], | 1879 ], |
1880 'sources!': [ | 1880 'sources!': [ |
1881 # use_aura currently sets use_ash on Windows. So take these tests ou t | 1881 # use_aura currently sets use_ash on Windows. So take these tests ou t |
1882 # for win aura builds. | 1882 # for win aura builds. |
1883 # TODO: enable these for win_ash browser tests. | 1883 # TODO: enable these for win_ash browser tests. |
1884 'browser/chromeos/system/tray_accessibility_browsertest.cc', | 1884 'browser/chromeos/system/tray_accessibility_browsertest.cc', |
1885 'browser/ui/ash/accelerator_commands_browsertest.cc', | |
pkotwicz
2014/03/18 21:54:32
Can you remove the windows specific code from acce
zturner
2014/03/18 21:58:12
The Windows specific code is still correct, should
| |
1885 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', | 1886 'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', |
1886 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc', | 1887 'browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc', |
1887 'browser/ui/ash/shelf_browsertest.cc', | 1888 'browser/ui/ash/shelf_browsertest.cc', |
1888 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc ', | 1889 'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc ', |
1889 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes t.cc', | 1890 'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertes t.cc', |
1890 ], | 1891 ], |
1891 }, { # else: OS != "win" | 1892 }, { # else: OS != "win" |
1892 'sources!': [ | 1893 'sources!': [ |
1893 'app/chrome_command_ids.h', | 1894 'app/chrome_command_ids.h', |
1894 'app/chrome_dll.rc', | 1895 'app/chrome_dll.rc', |
(...skipping 1338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3233 'utility', | 3234 'utility', |
3234 ], | 3235 ], |
3235 'sources': [ | 3236 'sources': [ |
3236 'tools/service_discovery_sniffer/service_discovery_sniffer.h', | 3237 'tools/service_discovery_sniffer/service_discovery_sniffer.h', |
3237 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', | 3238 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', |
3238 ], | 3239 ], |
3239 }] | 3240 }] |
3240 }], | 3241 }], |
3241 ], # 'conditions' | 3242 ], # 'conditions' |
3242 } | 3243 } |
OLD | NEW |