| 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 'chrome_browser_ui_non_ios_sources': [ | 7 'chrome_browser_ui_non_ios_sources': [ |
| 8 'browser/ui/accelerator_utils.h', | 8 'browser/ui/accelerator_utils.h', |
| 9 'browser/ui/android/android_about_app_info.cc', | 9 'browser/ui/android/android_about_app_info.cc', |
| 10 'browser/ui/android/android_about_app_info.h', | 10 'browser/ui/android/android_about_app_info.h', |
| (...skipping 2724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2735 'sources': [ '<@(chrome_browser_ui_views_sources)' ], | 2735 'sources': [ '<@(chrome_browser_ui_views_sources)' ], |
| 2736 'conditions': [ | 2736 'conditions': [ |
| 2737 ['chromeos == 0 and OS!="mac"', { | 2737 ['chromeos == 0 and OS!="mac"', { |
| 2738 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], | 2738 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], |
| 2739 }], | 2739 }], |
| 2740 ['use_ash == 1', { | 2740 ['use_ash == 1', { |
| 2741 'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ], | 2741 'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ], |
| 2742 }], | 2742 }], |
| 2743 ['OS!="mac"', { | 2743 ['OS!="mac"', { |
| 2744 'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ], | 2744 'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ], |
| 2745 'dependencies': [ |
| 2746 '<(DEPTH)/components/components.gyp:native_app_window_views', |
| 2747 ], |
| 2745 }], | 2748 }], |
| 2746 ], | 2749 ], |
| 2747 }], | 2750 }], |
| 2748 ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { | 2751 ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', { |
| 2749 'dependencies': [ | 2752 'dependencies': [ |
| 2750 # gtk2 is the only component that can interact with gtk2 in our new | 2753 # gtk2 is the only component that can interact with gtk2 in our new |
| 2751 # world. | 2754 # world. |
| 2752 'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', | 2755 'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', |
| 2753 '../build/linux/system.gyp:gio', | 2756 '../build/linux/system.gyp:gio', |
| 2754 ], | 2757 ], |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2997 }], | 3000 }], |
| 2998 ['OS!="android" and OS!="ios"', { | 3001 ['OS!="android" and OS!="ios"', { |
| 2999 'dependencies': [ | 3002 'dependencies': [ |
| 3000 '../device/bluetooth/bluetooth.gyp:device_bluetooth', | 3003 '../device/bluetooth/bluetooth.gyp:device_bluetooth', |
| 3001 ], | 3004 ], |
| 3002 }], | 3005 }], |
| 3003 ], | 3006 ], |
| 3004 }, | 3007 }, |
| 3005 ], | 3008 ], |
| 3006 } | 3009 } |
| OLD | NEW |