| OLD | NEW |
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 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 # There are two sections of sources: | 7 # There are two sections of sources: |
| 8 # * "Platform"-based sources (OS, toolkit, etc.) | 8 # * "Platform"-based sources (OS, toolkit, etc.) |
| 9 # * Feature/directory-based sources (e.g., history, printing) | 9 # * Feature/directory-based sources (e.g., history, printing) |
| 10 | 10 |
| (...skipping 2903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2914 ], | 2914 ], |
| 2915 'conditions': [ | 2915 'conditions': [ |
| 2916 ['chromeos == 0 and (OS!="mac" or mac_views_browser==1)', { | 2916 ['chromeos == 0 and (OS!="mac" or mac_views_browser==1)', { |
| 2917 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], | 2917 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], |
| 2918 }], | 2918 }], |
| 2919 ['use_ash == 1', { | 2919 ['use_ash == 1', { |
| 2920 'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ], | 2920 'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ], |
| 2921 }], | 2921 }], |
| 2922 ['OS!="mac"', { | 2922 ['OS!="mac"', { |
| 2923 'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ], | 2923 'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ], |
| 2924 'dependencies': [ |
| 2925 '../ui/gfx/gfx.gyp:gfx_vector_icons', |
| 2926 ], |
| 2924 'conditions': [ | 2927 'conditions': [ |
| 2925 ['enable_extensions==1', { | 2928 ['enable_extensions==1', { |
| 2926 'sources': [ '<@(chrome_browser_ui_views_extensions_non_mac_so
urces)' ], | 2929 'sources': [ '<@(chrome_browser_ui_views_extensions_non_mac_so
urces)' ], |
| 2927 }], | 2930 }], |
| 2928 ], | 2931 ], |
| 2929 }], | 2932 }], |
| 2930 ['enable_extensions==1', { | 2933 ['enable_extensions==1', { |
| 2931 'dependencies': [ | 2934 'dependencies': [ |
| 2932 '<(DEPTH)/extensions/components/extensions_components.gyp:native
_app_window', | 2935 '<(DEPTH)/extensions/components/extensions_components.gyp:native
_app_window', |
| 2933 ], | 2936 ], |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3208 ], | 3211 ], |
| 3209 'sources': [ | 3212 'sources': [ |
| 3210 '<@(chrome_browser_ui_non_mobile_sources)', | 3213 '<@(chrome_browser_ui_non_mobile_sources)', |
| 3211 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', | 3214 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', |
| 3212 ], | 3215 ], |
| 3213 }], | 3216 }], |
| 3214 ], | 3217 ], |
| 3215 }, | 3218 }, |
| 3216 ], | 3219 ], |
| 3217 } | 3220 } |
| OLD | NEW |