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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_ui', 9 'target_name': 'browser_ui',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_andro id.h', 89 'browser/ui/android/tab_contents/chrome_web_contents_view_delegate_andro id.h',
90 'browser/ui/android/tab_model/tab_model.cc', 90 'browser/ui/android/tab_model/tab_model.cc',
91 'browser/ui/android/tab_model/tab_model.h', 91 'browser/ui/android/tab_model/tab_model.h',
92 'browser/ui/android/tab_model/tab_model_list.cc', 92 'browser/ui/android/tab_model/tab_model_list.cc',
93 'browser/ui/android/tab_model/tab_model_list.h', 93 'browser/ui/android/tab_model/tab_model_list.h',
94 'browser/ui/android/tab_restore_service_delegate_android.cc', 94 'browser/ui/android/tab_restore_service_delegate_android.cc',
95 'browser/ui/android/window_android_helper.cc', 95 'browser/ui/android/window_android_helper.cc',
96 'browser/ui/android/window_android_helper.h', 96 'browser/ui/android/window_android_helper.h',
97 'browser/ui/app_list/app_list_controller.h', 97 'browser/ui/app_list/app_list_controller.h',
98 'browser/ui/app_list/app_list_controller.cc', 98 'browser/ui/app_list/app_list_controller.cc',
99 'browser/ui/app_list/app_list_view_delegate.cc',
100 'browser/ui/app_list/app_list_view_delegate.h',
101 'browser/ui/app_list/apps_model_builder.cc',
102 'browser/ui/app_list/apps_model_builder.h',
103 'browser/ui/app_list/chrome_app_list_item.h',
104 'browser/ui/app_list/extension_app_item.cc',
105 'browser/ui/app_list/extension_app_item.h',
106 'browser/ui/app_list/search_builder.cc',
107 'browser/ui/app_list/search_builder.h',
99 'browser/ui/app_modal_dialogs/app_modal_dialog.cc', 108 'browser/ui/app_modal_dialogs/app_modal_dialog.cc',
100 'browser/ui/app_modal_dialogs/app_modal_dialog.h', 109 'browser/ui/app_modal_dialogs/app_modal_dialog.h',
101 'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc', 110 'browser/ui/app_modal_dialogs/app_modal_dialog_queue.cc',
102 'browser/ui/app_modal_dialogs/app_modal_dialog_queue.h', 111 'browser/ui/app_modal_dialogs/app_modal_dialog_queue.h',
103 'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc', 112 'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc',
104 'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h', 113 'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h',
105 'browser/ui/app_modal_dialogs/javascript_dialog_creator.cc', 114 'browser/ui/app_modal_dialogs/javascript_dialog_creator.cc',
106 'browser/ui/app_modal_dialogs/javascript_dialog_creator.h', 115 'browser/ui/app_modal_dialogs/javascript_dialog_creator.h',
107 'browser/ui/app_modal_dialogs/native_app_modal_dialog.h', 116 'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
108 'browser/ui/ash/ash_init.cc', 117 'browser/ui/ash/ash_init.cc',
(...skipping 2163 matching lines...) Expand 10 before | Expand all | Expand 10 after
2272 '../printing/printing.gyp:cups', 2281 '../printing/printing.gyp:cups',
2273 ], 2282 ],
2274 }], 2283 }],
2275 ['use_gconf==0', { 2284 ['use_gconf==0', {
2276 'sources!': [ 2285 'sources!': [
2277 'browser/ui/gtk/gconf_titlebar_listener.cc', 2286 'browser/ui/gtk/gconf_titlebar_listener.cc',
2278 'browser/ui/gtk/gconf_titlebar_listener.h', 2287 'browser/ui/gtk/gconf_titlebar_listener.h',
2279 ], 2288 ],
2280 }], 2289 }],
2281 ['use_ash==1', { 2290 ['use_ash==1', {
2282 'sources': [
2283 'browser/ui/app_list/app_list_view_delegate.cc',
2284 'browser/ui/app_list/app_list_view_delegate.h',
2285 'browser/ui/app_list/apps_model_builder.cc',
2286 'browser/ui/app_list/apps_model_builder.h',
2287 'browser/ui/app_list/chrome_app_list_item.h',
2288 'browser/ui/app_list/extension_app_item.cc',
2289 'browser/ui/app_list/extension_app_item.h',
2290 'browser/ui/app_list/search_builder.cc',
2291 'browser/ui/app_list/search_builder.h',
2292 ],
2293 'dependencies': [ 2291 'dependencies': [
2294 '../ash/ash.gyp:ash', 2292 '../ash/ash.gyp:ash',
2295 '../ash/ash_strings.gyp:ash_strings', 2293 '../ash/ash_strings.gyp:ash_strings',
2296 '../ui/app_list/app_list.gyp:app_list',
2297 '../ui/message_center/message_center.gyp:message_center', 2294 '../ui/message_center/message_center.gyp:message_center',
2298 ], 2295 ],
2299 }], 2296 }],
2300 ['use_aura==1 and use_ash==0 and OS=="linux"', { 2297 ['use_aura==1 and use_ash==0 and OS=="linux"', {
2301 'dependencies': [ 2298 'dependencies': [
2302 # gtk2 is the only component that can interact with gtk2 in our new 2299 # gtk2 is the only component that can interact with gtk2 in our new
2303 # world. 2300 # world.
2304 'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui', 2301 'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
2305 ], 2302 ],
2306 }], 2303 }],
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
2641 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2638 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2642 '../ui/app_list/app_list.gyp:app_list', 2639 '../ui/app_list/app_list.gyp:app_list',
2643 '../ui/views/controls/webview/webview.gyp:webview', 2640 '../ui/views/controls/webview/webview.gyp:webview',
2644 '../ui/views/views.gyp:views', 2641 '../ui/views/views.gyp:views',
2645 ], 2642 ],
2646 'export_dependent_settings': [ 2643 'export_dependent_settings': [
2647 '../ui/views/controls/webview/webview.gyp:webview', 2644 '../ui/views/controls/webview/webview.gyp:webview',
2648 '../ui/views/views.gyp:views', 2645 '../ui/views/views.gyp:views',
2649 ], 2646 ],
2650 'sources': [ 2647 'sources': [
2651 'browser/ui/app_list/app_list_view_delegate.cc',
2652 'browser/ui/app_list/app_list_view_delegate.h',
2653 'browser/ui/app_list/apps_model_builder.cc',
2654 'browser/ui/app_list/apps_model_builder.h',
2655 'browser/ui/app_list/chrome_app_list_item.h',
2656 'browser/ui/app_list/extension_app_item.cc',
2657 'browser/ui/app_list/extension_app_item.h',
2658 'browser/ui/app_list/search_builder.cc',
2659 'browser/ui/app_list/search_builder.h',
2660 'browser/ui/views/network_profile_bubble_view.cc', 2648 'browser/ui/views/network_profile_bubble_view.cc',
2661 'browser/ui/views/network_profile_bubble_view.h', 2649 'browser/ui/views/network_profile_bubble_view.h',
2662 'browser/ui/webui/conflicts_ui.cc', 2650 'browser/ui/webui/conflicts_ui.cc',
2663 'browser/ui/webui/conflicts_ui.h', 2651 'browser/ui/webui/conflicts_ui.h',
2664 ], 2652 ],
2665 'sources!': [ 2653 'sources!': [
2666 'browser/ui/certificate_dialogs.cc', 2654 'browser/ui/certificate_dialogs.cc',
2667 'browser/ui/certificate_dialogs.h', 2655 'browser/ui/certificate_dialogs.h',
2668 'browser/ui/crypto_module_password_dialog.cc', 2656 'browser/ui/crypto_module_password_dialog.cc',
2669 'browser/ui/crypto_module_password_dialog_nss.cc', 2657 'browser/ui/crypto_module_password_dialog_nss.cc',
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
2749 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'], 2737 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'],
2750 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'], 2738 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'],
2751 ]}, { 2739 ]}, {
2752 'sources/': [ 2740 'sources/': [
2753 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'], 2741 ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
2754 ['exclude', '^browser/ui/views/select_file_dialog_extension.h'], 2742 ['exclude', '^browser/ui/views/select_file_dialog_extension.h'],
2755 ['exclude', '^browser/ui/views/select_file_dialog_extension_factory. cc'], 2743 ['exclude', '^browser/ui/views/select_file_dialog_extension_factory. cc'],
2756 ['exclude', '^browser/ui/views/select_file_dialog_extension_factory. h'], 2744 ['exclude', '^browser/ui/views/select_file_dialog_extension_factory. h'],
2757 ]} 2745 ]}
2758 ], 2746 ],
2747 ['enable_app_list==1', {
2748 'dependencies': [
2749 '../ui/app_list/app_list.gyp:app_list',
2750 ],
2751 }, { # else: enable_app_list==0
2752 'sources/': [
2753 ['exclude', '^browser/ui/views/app_list/'],
2754 ['exclude', '^browser/ui/app_list/'],
2755 ]
2756 }],
2759 ], 2757 ],
2760 }, 2758 },
2761 ], 2759 ],
2762 } 2760 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698