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 'variables': { | 5 'variables': { |
6 'chromium_code': 1, | 6 'chromium_code': 1, |
7 }, | 7 }, |
msw
2014/04/18 19:57:57
Are these changes from a bad rebase or something?
Yuki
2014/04/22 09:09:02
I don't understand what lines you're talking about
msw
2014/04/22 17:12:56
Weird, now I don't see any odd changes either, per
| |
8 'target_defaults': { | 8 'target_defaults': { |
9 'conditions': [ | 9 'conditions': [ |
10 ['use_aura==1', { | 10 ['use_aura==1', { |
11 'sources/': [ ['exclude', '_win\\.(h|cc)$'] ], | 11 'sources/': [ ['exclude', '_win\\.(h|cc)$'] ], |
12 'dependencies': [ '../aura/aura.gyp:aura', ], | 12 'dependencies': [ '../aura/aura.gyp:aura', ], |
13 }], | 13 }], |
14 ['OS!="linux" or chromeos==1', { | 14 ['OS!="linux" or chromeos==1', { |
15 'sources/': [ ['exclude', '_linux\\.(h|cc)$'] ], | 15 'sources/': [ ['exclude', '_linux\\.(h|cc)$'] ], |
16 }], | 16 }], |
17 ], | 17 ], |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
293 'focus/focus_manager.h', | 293 'focus/focus_manager.h', |
294 'focus/focus_manager_delegate.h', | 294 'focus/focus_manager_delegate.h', |
295 'focus/focus_manager_factory.cc', | 295 'focus/focus_manager_factory.cc', |
296 'focus/focus_manager_factory.h', | 296 'focus/focus_manager_factory.h', |
297 'focus/focus_search.cc', | 297 'focus/focus_search.cc', |
298 'focus/focus_search.h', | 298 'focus/focus_search.h', |
299 'focus/view_storage.cc', | 299 'focus/view_storage.cc', |
300 'focus/view_storage.h', | 300 'focus/view_storage.h', |
301 'focus/widget_focus_manager.cc', | 301 'focus/widget_focus_manager.cc', |
302 'focus/widget_focus_manager.h', | 302 'focus/widget_focus_manager.h', |
303 'ime/input_method.h', | |
303 'ime/input_method_base.cc', | 304 'ime/input_method_base.cc', |
304 'ime/input_method_base.h', | 305 'ime/input_method_base.h', |
305 'ime/input_method_bridge.cc', | 306 'ime/input_method_bridge.cc', |
306 'ime/input_method_bridge.h', | 307 'ime/input_method_bridge.h', |
307 'ime/input_method_delegate.h', | 308 'ime/input_method_delegate.h', |
308 'ime/input_method.h', | |
309 'ime/mock_input_method.cc', | 309 'ime/mock_input_method.cc', |
310 'ime/mock_input_method.h', | 310 'ime/mock_input_method.h', |
311 'ime/null_input_method.cc', | |
312 'ime/null_input_method.h', | |
311 'layout/box_layout.cc', | 313 'layout/box_layout.cc', |
312 'layout/box_layout.h', | 314 'layout/box_layout.h', |
313 'layout/fill_layout.cc', | 315 'layout/fill_layout.cc', |
314 'layout/fill_layout.h', | 316 'layout/fill_layout.h', |
315 'layout/grid_layout.cc', | 317 'layout/grid_layout.cc', |
316 'layout/grid_layout.h', | 318 'layout/grid_layout.h', |
317 'layout/layout_constants.h', | 319 'layout/layout_constants.h', |
318 'layout/layout_manager.cc', | 320 'layout/layout_manager.cc', |
319 'layout/layout_manager.h', | 321 'layout/layout_manager.h', |
320 'linux_ui/linux_ui.h', | 322 'linux_ui/linux_ui.h', |
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1068 'sources/': [ | 1070 'sources/': [ |
1069 # This is needed because the aura rule strips it from the default | 1071 # This is needed because the aura rule strips it from the default |
1070 # sources list. | 1072 # sources list. |
1071 ['include', '^../../content/app/startup_helper_win.cc'], | 1073 ['include', '^../../content/app/startup_helper_win.cc'], |
1072 ], | 1074 ], |
1073 }], | 1075 }], |
1074 ], | 1076 ], |
1075 }, # target_name: views_examples_with_content_exe | 1077 }, # target_name: views_examples_with_content_exe |
1076 ], | 1078 ], |
1077 } | 1079 } |
OLD | NEW |