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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 382113002: Only enable Hotwords when extensions are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
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 1115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1126 'browser/ui/webui/user_actions/user_actions_ui.cc', 1126 'browser/ui/webui/user_actions/user_actions_ui.cc',
1127 'browser/ui/webui/user_actions/user_actions_ui.h', 1127 'browser/ui/webui/user_actions/user_actions_ui.h',
1128 'browser/ui/webui/user_actions/user_actions_ui_handler.cc', 1128 'browser/ui/webui/user_actions/user_actions_ui_handler.cc',
1129 'browser/ui/webui/user_actions/user_actions_ui_handler.h', 1129 'browser/ui/webui/user_actions/user_actions_ui_handler.h',
1130 'browser/ui/webui/version_handler.cc', 1130 'browser/ui/webui/version_handler.cc',
1131 'browser/ui/webui/version_handler_chromeos.cc', 1131 'browser/ui/webui/version_handler_chromeos.cc',
1132 'browser/ui/webui/version_handler_chromeos.h', 1132 'browser/ui/webui/version_handler_chromeos.h',
1133 'browser/ui/webui/version_handler.h', 1133 'browser/ui/webui/version_handler.h',
1134 'browser/ui/webui/version_ui.cc', 1134 'browser/ui/webui/version_ui.cc',
1135 'browser/ui/webui/version_ui.h', 1135 'browser/ui/webui/version_ui.h',
1136 'browser/ui/webui/voicesearch_ui.cc',
1137 'browser/ui/webui/voicesearch_ui.h',
1138 'browser/ui/webui/welcome_handler_android.cc', 1136 'browser/ui/webui/welcome_handler_android.cc',
1139 'browser/ui/webui/welcome_handler_android.h', 1137 'browser/ui/webui/welcome_handler_android.h',
1140 'browser/ui/webui/welcome_ui_android.cc', 1138 'browser/ui/webui/welcome_ui_android.cc',
1141 'browser/ui/webui/welcome_ui_android.h', 1139 'browser/ui/webui/welcome_ui_android.h',
1142 'browser/ui/window_sizer/window_sizer_mac.mm', 1140 'browser/ui/window_sizer/window_sizer_mac.mm',
1143 'browser/ui/zoom/zoom_controller.cc', 1141 'browser/ui/zoom/zoom_controller.cc',
1144 'browser/ui/zoom/zoom_controller.h', 1142 'browser/ui/zoom/zoom_controller.h',
1145 'browser/ui/zoom/zoom_event_manager.cc', 1143 'browser/ui/zoom/zoom_event_manager.cc',
1146 'browser/ui/zoom/zoom_event_manager.h', 1144 'browser/ui/zoom/zoom_event_manager.h',
1147 'browser/ui/zoom/zoom_observer.h', 1145 'browser/ui/zoom/zoom_observer.h',
(...skipping 1371 matching lines...) Expand 10 before | Expand all | Expand 10 after
2519 'browser/ui/views/javascript_app_modal_event_blocker_x11.cc', 2517 'browser/ui/views/javascript_app_modal_event_blocker_x11.cc',
2520 'browser/ui/views/javascript_app_modal_event_blocker_x11.h', 2518 'browser/ui/views/javascript_app_modal_event_blocker_x11.h',
2521 'browser/ui/views/tabs/window_finder_x11.cc', 2519 'browser/ui/views/tabs/window_finder_x11.cc',
2522 ], 2520 ],
2523 # Files used on iOS. iOS uses only these files and does not share other 2521 # Files used on iOS. iOS uses only these files and does not share other
2524 # lists, so a file may appear here and in the non_ios_sources also. 2522 # lists, so a file may appear here and in the non_ios_sources also.
2525 'chrome_browser_ui_ios_sources': [ 2523 'chrome_browser_ui_ios_sources': [
2526 'browser/ui/profile_error_dialog.cc', 2524 'browser/ui/profile_error_dialog.cc',
2527 'browser/ui/profile_error_dialog.h', 2525 'browser/ui/profile_error_dialog.h',
2528 ], 2526 ],
2527 'chrome_browser_ui_extensions_sources': [
2528 'browser/ui/webui/voicesearch_ui.cc',
2529 'browser/ui/webui/voicesearch_ui.h',
2530 ],
2529 }, 2531 },
2530 'targets': [ 2532 'targets': [
2531 { 2533 {
2532 'target_name': 'browser_ui', 2534 'target_name': 'browser_ui',
2533 'type': 'static_library', 2535 'type': 'static_library',
2534 'variables': { 'enable_wexit_time_destructors': 1, }, 2536 'variables': { 'enable_wexit_time_destructors': 1, },
2535 # Since browser and browser_ui actually depend on each other, 2537 # Since browser and browser_ui actually depend on each other,
2536 # we must omit the dependency from browser_ui to browser. 2538 # we must omit the dependency from browser_ui to browser.
2537 # However, this means browser_ui and browser should more or less 2539 # However, this means browser_ui and browser should more or less
2538 # have the same dependencies. Once browser_ui is untangled from 2540 # have the same dependencies. Once browser_ui is untangled from
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
2921 'sources': [ 2923 'sources': [
2922 '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)', 2924 '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)',
2923 ], 2925 ],
2924 'dependencies': [ 2926 'dependencies': [
2925 '../third_party/libaddressinput/libaddressinput.gyp:libaddressin put', 2927 '../third_party/libaddressinput/libaddressinput.gyp:libaddressin put',
2926 '../third_party/libaddressinput/libaddressinput.gyp:libaddressin put_strings', 2928 '../third_party/libaddressinput/libaddressinput.gyp:libaddressin put_strings',
2927 ], 2929 ],
2928 }], 2930 }],
2929 ], 2931 ],
2930 }], 2932 }],
2933 ['enable_extensions==1', {
2934 'sources': [ '<@(chrome_browser_ui_extensions_sources)' ],
2935 }],
2931 ['enable_google_now==1 and OS!="android"', { 2936 ['enable_google_now==1 and OS!="android"', {
2932 'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ], 2937 'sources': [ '<@(chrome_browser_ui_google_now_non_android_sources)' ],
2933 }], 2938 }],
2934 ['enable_webrtc==1', { 2939 ['enable_webrtc==1', {
2935 'sources': [ '<@(chrome_browser_ui_webrtc_sources)' ], 2940 'sources': [ '<@(chrome_browser_ui_webrtc_sources)' ],
2936 }], 2941 }],
2937 ['enable_service_discovery==1', { 2942 ['enable_service_discovery==1', {
2938 'sources': [ '<@(chrome_browser_ui_service_discovery_sources)' ], 2943 'sources': [ '<@(chrome_browser_ui_service_discovery_sources)' ],
2939 }], 2944 }],
2940 ['enable_spellcheck==1', { 2945 ['enable_spellcheck==1', {
2941 'dependencies': [ 2946 'dependencies': [
2942 '../third_party/hunspell/hunspell.gyp:hunspell', 2947 '../third_party/hunspell/hunspell.gyp:hunspell',
2943 ], 2948 ],
2944 }], 2949 }],
2945 ], 2950 ],
2946 }, 2951 },
2947 ], 2952 ],
2948 } 2953 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698