Chromium Code Reviews| 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 2835 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2846 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], | 2846 'sources': [ '<@(chrome_browser_ui_views_non_chromeos_sources)' ], |
| 2847 }], | 2847 }], |
| 2848 ['use_ash == 1', { | 2848 ['use_ash == 1', { |
| 2849 'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ], | 2849 'sources': [ '<@(chrome_browser_ui_ash_views_sources)' ], |
| 2850 }], | 2850 }], |
| 2851 ['OS=="mac"', { | 2851 ['OS=="mac"', { |
| 2852 'conditions': [ | 2852 'conditions': [ |
| 2853 ['mac_views_browser==1', { | 2853 ['mac_views_browser==1', { |
| 2854 'sources': [ | 2854 'sources': [ |
| 2855 'browser/ui/views/apps/chrome_app_window_client_views_mac.mm ', | 2855 'browser/ui/views/apps/chrome_app_window_client_views_mac.mm ', |
| 2856 'browser/ui/views/apps/chrome_native_app_window_views_mac.h' , | |
| 2857 'browser/ui/views/apps/chrome_native_app_window_views_mac.mm ', | |
| 2856 ], | 2858 ], |
| 2857 'sources!': [ | 2859 'sources!': [ |
| 2858 'browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm', | 2860 'browser/ui/cocoa/apps/chrome_app_window_client_cocoa.mm', |
| 2859 #'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm', | 2861 #'browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm', |
|
tapted
2015/03/04 02:27:33
I guess this is commented out in your upstream? it
jackhou1
2015/03/04 03:34:55
The trybots ran fine. But rebased anyway.
| |
| 2860 #'browser/ui/cocoa/browser_window_factory_cocoa.mm', | 2862 #'browser/ui/cocoa/browser_window_factory_cocoa.mm', |
| 2861 #'browser/ui/cocoa/infobars/confirm_infobar_controller.mm', | 2863 #'browser/ui/cocoa/infobars/confirm_infobar_controller.mm', |
| 2862 #'browser/ui/cocoa/tab_dialogs_cocoa.mm', | 2864 #'browser/ui/cocoa/tab_dialogs_cocoa.mm', |
| 2863 | 2865 |
| 2864 'browser/ui/views/bookmarks/bookmark_drag_drop_views.cc', | 2866 'browser/ui/views/bookmarks/bookmark_drag_drop_views.cc', |
| 2865 'browser/ui/views/frame/browser_window_factory.cc', | 2867 'browser/ui/views/frame/browser_window_factory.cc', |
| 2866 'browser/ui/views/infobar/confirm_infobar.cc' | 2868 'browser/ui/views/infobar/confirm_infobar.cc' |
| 2867 'browser/ui/views/tab_dialogs_views.cc', | 2869 'browser/ui/views/tab_dialogs_views.cc', |
| 2868 ], | 2870 ], |
| 2869 'dependencies': [ | 2871 'dependencies': [ |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3152 ], | 3154 ], |
| 3153 'sources': [ | 3155 'sources': [ |
| 3154 '<@(chrome_browser_ui_non_mobile_sources)', | 3156 '<@(chrome_browser_ui_non_mobile_sources)', |
| 3155 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', | 3157 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', |
| 3156 ], | 3158 ], |
| 3157 }], | 3159 }], |
| 3158 ], | 3160 ], |
| 3159 }, | 3161 }, |
| 3160 ], | 3162 ], |
| 3161 } | 3163 } |
| OLD | NEW |