Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1905 matching lines...) Expand 10 before | Expand all | Expand 10 after
1916 'browser/ui/views/bookmarks/bookmark_editor_view.cc', 1916 'browser/ui/views/bookmarks/bookmark_editor_view.cc',
1917 'browser/ui/views/bookmarks/bookmark_editor_view.h', 1917 'browser/ui/views/bookmarks/bookmark_editor_view.h',
1918 'browser/ui/views/bookmarks/bookmark_menu_controller_observer.h', 1918 'browser/ui/views/bookmarks/bookmark_menu_controller_observer.h',
1919 'browser/ui/views/bookmarks/bookmark_menu_controller_views.cc', 1919 'browser/ui/views/bookmarks/bookmark_menu_controller_views.cc',
1920 'browser/ui/views/bookmarks/bookmark_menu_controller_views.h', 1920 'browser/ui/views/bookmarks/bookmark_menu_controller_views.h',
1921 'browser/ui/views/bookmarks/bookmark_menu_delegate.cc', 1921 'browser/ui/views/bookmarks/bookmark_menu_delegate.cc',
1922 'browser/ui/views/bookmarks/bookmark_menu_delegate.h', 1922 'browser/ui/views/bookmarks/bookmark_menu_delegate.h',
1923 'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc', 1923 'browser/ui/views/bookmarks/bookmark_sync_promo_view.cc',
1924 'browser/ui/views/bookmarks/bookmark_sync_promo_view.h', 1924 'browser/ui/views/bookmarks/bookmark_sync_promo_view.h',
1925 'browser/ui/views/certificate_viewer_win.cc', 1925 'browser/ui/views/certificate_viewer_win.cc',
1926 'browser/ui/views/chrome_views_delegate.cc',
1926 'browser/ui/views/chrome_views_delegate_chromeos.cc', 1927 'browser/ui/views/chrome_views_delegate_chromeos.cc',
1927 'browser/ui/views/chrome_web_dialog_view.cc', 1928 'browser/ui/views/chrome_web_dialog_view.cc',
1928 'browser/ui/views/collected_cookies_views.cc', 1929 'browser/ui/views/collected_cookies_views.cc',
1929 'browser/ui/views/collected_cookies_views.h', 1930 'browser/ui/views/collected_cookies_views.h',
1930 'browser/ui/views/color_chooser_aura.cc', 1931 'browser/ui/views/color_chooser_aura.cc',
1931 'browser/ui/views/color_chooser_aura.h', 1932 'browser/ui/views/color_chooser_aura.h',
1932 'browser/ui/views/color_chooser_win.cc', 1933 'browser/ui/views/color_chooser_win.cc',
1933 'browser/ui/views/confirm_bubble_views.cc', 1934 'browser/ui/views/confirm_bubble_views.cc',
1934 'browser/ui/views/confirm_bubble_views.h', 1935 'browser/ui/views/confirm_bubble_views.h',
1935 'browser/ui/views/conflicting_module_view_win.cc', 1936 'browser/ui/views/conflicting_module_view_win.cc',
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
2168 'browser/ui/views/profiles/new_avatar_button.cc', 2169 'browser/ui/views/profiles/new_avatar_button.cc',
2169 'browser/ui/views/profiles/new_avatar_button.h', 2170 'browser/ui/views/profiles/new_avatar_button.h',
2170 'browser/ui/views/profiles/profile_chooser_view.cc', 2171 'browser/ui/views/profiles/profile_chooser_view.cc',
2171 'browser/ui/views/profiles/profile_chooser_view.h', 2172 'browser/ui/views/profiles/profile_chooser_view.h',
2172 'browser/ui/views/profiles/profile_reset_bubble_view.cc', 2173 'browser/ui/views/profiles/profile_reset_bubble_view.cc',
2173 'browser/ui/views/profiles/profile_reset_bubble_view.h', 2174 'browser/ui/views/profiles/profile_reset_bubble_view.h',
2174 'browser/ui/views/profiles/supervised_user_avatar_label.cc', 2175 'browser/ui/views/profiles/supervised_user_avatar_label.cc',
2175 'browser/ui/views/profiles/supervised_user_avatar_label.h', 2176 'browser/ui/views/profiles/supervised_user_avatar_label.h',
2176 'browser/ui/views/profiles/user_manager_view.cc', 2177 'browser/ui/views/profiles/user_manager_view.cc',
2177 'browser/ui/views/profiles/user_manager_view.h', 2178 'browser/ui/views/profiles/user_manager_view.h',
2178 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' ,
2179 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
2180 'browser/ui/views/sad_tab_view.cc', 2179 'browser/ui/views/sad_tab_view.cc',
2181 'browser/ui/views/sad_tab_view.h', 2180 'browser/ui/views/sad_tab_view.h',
2182 'browser/ui/views/session_crashed_bubble_view.cc', 2181 'browser/ui/views/session_crashed_bubble_view.cc',
2183 'browser/ui/views/session_crashed_bubble_view.h', 2182 'browser/ui/views/session_crashed_bubble_view.h',
2184 'browser/ui/views/settings_api_bubble_helper_views.cc', 2183 'browser/ui/views/settings_api_bubble_helper_views.cc',
2185 'browser/ui/views/settings_api_bubble_helper_views.h', 2184 'browser/ui/views/settings_api_bubble_helper_views.h',
2186 'browser/ui/views/signed_certificate_timestamp_info_view.cc', 2185 'browser/ui/views/signed_certificate_timestamp_info_view.cc',
2187 'browser/ui/views/signed_certificate_timestamp_info_view.h', 2186 'browser/ui/views/signed_certificate_timestamp_info_view.h',
2188 'browser/ui/views/signed_certificate_timestamps_views.cc', 2187 'browser/ui/views/signed_certificate_timestamps_views.cc',
2189 'browser/ui/views/signed_certificate_timestamps_views.h', 2188 'browser/ui/views/signed_certificate_timestamps_views.h',
2190 'browser/ui/views/simple_message_box_views.cc', 2189 'browser/ui/views/simple_message_box_views.cc',
2191 'browser/ui/views/ssl_client_certificate_selector.cc', 2190 'browser/ui/views/ssl_client_certificate_selector.cc',
2192 'browser/ui/views/ssl_client_certificate_selector.h', 2191 'browser/ui/views/ssl_client_certificate_selector.h',
2193 'browser/ui/views/status_bubble_views.cc', 2192 'browser/ui/views/status_bubble_views.cc',
2194 'browser/ui/views/status_bubble_views.h', 2193 'browser/ui/views/status_bubble_views.h',
2195 'browser/ui/views/status_icons/status_icon_win.cc', 2194 'browser/ui/views/status_icons/status_icon_win.cc',
2196 'browser/ui/views/status_icons/status_icon_win.h', 2195 'browser/ui/views/status_icons/status_icon_win.h',
2197 'browser/ui/views/status_icons/status_tray_linux.cc', 2196 'browser/ui/views/status_icons/status_tray_linux.cc',
2198 'browser/ui/views/status_icons/status_tray_linux.h', 2197 'browser/ui/views/status_icons/status_tray_linux.h',
2199 'browser/ui/views/status_icons/status_tray_state_changer_win.cc', 2198 'browser/ui/views/status_icons/status_tray_state_changer_win.cc',
2200 'browser/ui/views/status_icons/status_tray_state_changer_win.h', 2199 'browser/ui/views/status_icons/status_tray_state_changer_win.h',
2201 'browser/ui/views/status_icons/status_tray_win.cc', 2200 'browser/ui/views/status_icons/status_tray_win.cc',
2202 'browser/ui/views/status_icons/status_tray_win.h', 2201 'browser/ui/views/status_icons/status_tray_win.h',
2203 'browser/ui/views/stubs_aura.cc', 2202 'browser/ui/views/stubs_aura.cc',
2204 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc', 2203 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.cc',
2205 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h', 2204 'browser/ui/views/sync/profile_signin_confirmation_dialog_views.h',
2206 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc' ,
2207 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
2208 'browser/ui/views/tab_icon_view.cc', 2205 'browser/ui/views/tab_icon_view.cc',
2209 'browser/ui/views/tab_icon_view.h', 2206 'browser/ui/views/tab_icon_view.h',
2210 'browser/ui/views/tab_modal_confirm_dialog_views.cc', 2207 'browser/ui/views/tab_modal_confirm_dialog_views.cc',
2211 'browser/ui/views/tab_modal_confirm_dialog_views.h', 2208 'browser/ui/views/tab_modal_confirm_dialog_views.h',
2212 'browser/ui/views/tabs/browser_tab_strip_controller.cc', 2209 'browser/ui/views/tabs/browser_tab_strip_controller.cc',
2213 'browser/ui/views/tabs/browser_tab_strip_controller.h', 2210 'browser/ui/views/tabs/browser_tab_strip_controller.h',
2214 'browser/ui/views/tabs/media_indicator_button.cc', 2211 'browser/ui/views/tabs/media_indicator_button.cc',
2215 'browser/ui/views/tabs/media_indicator_button.h', 2212 'browser/ui/views/tabs/media_indicator_button.h',
2216 'browser/ui/views/tabs/stacked_tab_strip_layout.cc', 2213 'browser/ui/views/tabs/stacked_tab_strip_layout.cc',
2217 'browser/ui/views/tabs/stacked_tab_strip_layout.h', 2214 'browser/ui/views/tabs/stacked_tab_strip_layout.h',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
2277 'browser/ui/app_list/app_list_service_views.cc', 2274 'browser/ui/app_list/app_list_service_views.cc',
2278 'browser/ui/app_list/app_list_service_views.h', 2275 'browser/ui/app_list/app_list_service_views.h',
2279 'browser/ui/app_list/app_list_shower_views.cc', 2276 'browser/ui/app_list/app_list_shower_views.cc',
2280 'browser/ui/app_list/app_list_shower_views.h', 2277 'browser/ui/app_list/app_list_shower_views.h',
2281 'browser/ui/views/accessibility/accessibility_event_router_views.cc', 2278 'browser/ui/views/accessibility/accessibility_event_router_views.cc',
2282 'browser/ui/views/accessibility/accessibility_event_router_views.h', 2279 'browser/ui/views/accessibility/accessibility_event_router_views.h',
2283 'browser/ui/views/chrome_browser_main_extra_parts_views.cc', 2280 'browser/ui/views/chrome_browser_main_extra_parts_views.cc',
2284 'browser/ui/views/chrome_browser_main_extra_parts_views.h', 2281 'browser/ui/views/chrome_browser_main_extra_parts_views.h',
2285 'browser/ui/views/chrome_views_delegate.cc', 2282 'browser/ui/views/chrome_views_delegate.cc',
2286 'browser/ui/views/chrome_views_delegate.h', 2283 'browser/ui/views/chrome_views_delegate.h',
2284 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc' ,
2285 'browser/ui/views/renderer_context_menu/render_view_context_menu_views.h',
2286 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.cc' ,
2287 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views.h',
2288 'browser/ui/views/tab_contents/chrome_web_contents_view_delegate_views_mac .mm',
2287 ], 2289 ],
2288 # Views files for everwhere but ChromeOS. 2290 # Views files for everwhere but ChromeOS.
2289 'chrome_browser_ui_views_non_chromeos_sources': [ 2291 'chrome_browser_ui_views_non_chromeos_sources': [
2290 'browser/ui/views/chrome_views_delegate_aura.cc', 2292 'browser/ui/views/chrome_views_delegate_aura.cc',
2291 'browser/ui/views/external_protocol_dialog.cc', 2293 'browser/ui/views/external_protocol_dialog.cc',
2292 'browser/ui/views/external_protocol_dialog.h', 2294 'browser/ui/views/external_protocol_dialog.h',
2293 'browser/ui/views/frame/desktop_browser_frame_aura.cc', 2295 'browser/ui/views/frame/desktop_browser_frame_aura.cc',
2294 'browser/ui/views/frame/desktop_browser_frame_aura.h', 2296 'browser/ui/views/frame/desktop_browser_frame_aura.h',
2295 'browser/ui/views/frame/opaque_browser_frame_view.cc', 2297 'browser/ui/views/frame/opaque_browser_frame_view.cc',
2296 'browser/ui/views/frame/opaque_browser_frame_view.h', 2298 'browser/ui/views/frame/opaque_browser_frame_view.h',
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
2655 ['enable_printing!=0', { 2657 ['enable_printing!=0', {
2656 'dependencies': [ 2658 'dependencies': [
2657 '../printing/printing.gyp:printing', 2659 '../printing/printing.gyp:printing',
2658 ], 2660 ],
2659 }], 2661 }],
2660 ['enable_one_click_signin==1', { 2662 ['enable_one_click_signin==1', {
2661 'sources': [ '<@(chrome_browser_ui_one_click_signin_sources)' ] 2663 'sources': [ '<@(chrome_browser_ui_one_click_signin_sources)' ]
2662 }], 2664 }],
2663 ['enable_task_manager==1', { 2665 ['enable_task_manager==1', {
2664 'sources': [ '<@(chrome_browser_ui_task_manager_sources)' ], 2666 'sources': [ '<@(chrome_browser_ui_task_manager_sources)' ],
2667 'conditions': [
2668 ['toolkit_views==0', {
2669 'sources!': [
2670 'browser/ui/views/task_manager_view.cc',
2671 ]
2672 }],
2673 ],
2665 }], 2674 }],
2666 ['disable_nacl==0', { 2675 ['disable_nacl==0', {
2667 'sources': [ '<@(chrome_browser_ui_nacl_sources)' ], 2676 'sources': [ '<@(chrome_browser_ui_nacl_sources)' ],
2668 'dependencies': [ 2677 'dependencies': [
2669 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l', 2678 '../native_client/src/trusted/service_runtime/service_runtime.gyp:se l',
2670 ], 2679 ],
2671 }], 2680 }],
2672 ['debug_devtools==1', { 2681 ['debug_devtools==1', {
2673 'defines': [ 2682 'defines': [
2674 'DEBUG_DEVTOOLS=1', 2683 'DEBUG_DEVTOOLS=1',
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
2827 'sources': [ '<@(chrome_browser_ui_non_android_sources)' ], 2836 'sources': [ '<@(chrome_browser_ui_non_android_sources)' ],
2828 }], 2837 }],
2829 ['OS=="mac"', { 2838 ['OS=="mac"', {
2830 'sources': [ '<@(chrome_browser_ui_mac_sources)' ], 2839 'sources': [ '<@(chrome_browser_ui_mac_sources)' ],
2831 'sources!': [ 2840 'sources!': [
2832 # Mac has its own way of drawing tabs. 2841 # Mac has its own way of drawing tabs.
2833 'browser/ui/tabs/tab_resources.cc', 2842 'browser/ui/tabs/tab_resources.cc',
2834 'browser/ui/tabs/tab_resources.h', 2843 'browser/ui/tabs/tab_resources.h',
2835 'browser/ui/views/extensions/extension_view_views.cc', 2844 'browser/ui/views/extensions/extension_view_views.cc',
2836 'browser/ui/views/extensions/extension_view_views.h', 2845 'browser/ui/views/extensions/extension_view_views.h',
2837 # Task manager has its own sources list. Leave out the views one.
2838 'browser/ui/views/task_manager_view.cc',
2839 ], 2846 ],
2840 'dependencies': [ 2847 'dependencies': [
2841 '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample _code', 2848 '../third_party/apple_sample_code/apple_sample_code.gyp:apple_sample _code',
2842 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac', 2849 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac',
2843 '../third_party/molokocacao/molokocacao.gyp:molokocacao', 2850 '../third_party/molokocacao/molokocacao.gyp:molokocacao',
2844 '../third_party/mozilla/mozilla.gyp:mozilla', 2851 '../third_party/mozilla/mozilla.gyp:mozilla',
2845 ], 2852 ],
2846 'link_settings': { 2853 'link_settings': {
2847 'libraries': [ 2854 'libraries': [
2848 '$(SDKROOT)/System/Library/Frameworks/Quartz.framework', 2855 '$(SDKROOT)/System/Library/Frameworks/Quartz.framework',
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
3014 }], 3021 }],
3015 ['OS!="android" and OS!="ios"', { 3022 ['OS!="android" and OS!="ios"', {
3016 'dependencies': [ 3023 'dependencies': [
3017 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 3024 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
3018 ], 3025 ],
3019 }], 3026 }],
3020 ], 3027 ],
3021 }, 3028 },
3022 ], 3029 ],
3023 } 3030 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698