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

Side by Side Diff: chrome/chrome_browser.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
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', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 2729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2740 }], 2740 }],
2741 ['OS=="win"', { 2741 ['OS=="win"', {
2742 'include_dirs': [ 2742 'include_dirs': [
2743 '<(DEPTH)/third_party/wtl/include', 2743 '<(DEPTH)/third_party/wtl/include',
2744 ], 2744 ],
2745 'dependencies': [ 2745 'dependencies': [
2746 'installer_util_strings', 2746 'installer_util_strings',
2747 '../google_update/google_update.gyp:google_update', 2747 '../google_update/google_update.gyp:google_update',
2748 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 2748 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
2749 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 2749 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
2750 '../ui/app_list/app_list.gyp:app_list',
2751 '../ui/views/controls/webview/webview.gyp:webview', 2750 '../ui/views/controls/webview/webview.gyp:webview',
2752 '../ui/views/views.gyp:views', 2751 '../ui/views/views.gyp:views',
2753 ], 2752 ],
2754 'export_dependent_settings': [ 2753 'export_dependent_settings': [
2755 '../ui/views/controls/webview/webview.gyp:webview', 2754 '../ui/views/controls/webview/webview.gyp:webview',
2756 '../ui/views/views.gyp:views', 2755 '../ui/views/views.gyp:views',
2757 ], 2756 ],
2758 'sources': [ 2757 'sources': [
2759 # Using built-in rule in vstudio for midl. 2758 # Using built-in rule in vstudio for midl.
2760 'browser/history/history_indexer.idl', 2759 'browser/history/history_indexer.idl',
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
2847 'browser/protector/protector_service.cc', 2846 'browser/protector/protector_service.cc',
2848 'browser/protector/protector_service.h', 2847 'browser/protector/protector_service.h',
2849 'browser/protector/protector_service_factory.cc', 2848 'browser/protector/protector_service_factory.cc',
2850 'browser/protector/protector_service_factory.h', 2849 'browser/protector/protector_service_factory.h',
2851 'browser/protector/session_startup_change.cc', 2850 'browser/protector/session_startup_change.cc',
2852 'browser/protector/settings_change_global_error.cc', 2851 'browser/protector/settings_change_global_error.cc',
2853 'browser/protector/settings_change_global_error.h', 2852 'browser/protector/settings_change_global_error.h',
2854 'browser/protector/settings_change_global_error_delegate.h', 2853 'browser/protector/settings_change_global_error_delegate.h',
2855 ], 2854 ],
2856 }], 2855 }],
2857 [ 'use_openssl==1', { 2856 ['use_openssl==1', {
2858 'sources!': [ 2857 'sources!': [
2859 'browser/importer/nss_decryptor.cc', 2858 'browser/importer/nss_decryptor.cc',
2860 'browser/importer/nss_decryptor_system_nss.cc', 2859 'browser/importer/nss_decryptor_system_nss.cc',
2861 'browser/importer/nss_decryptor_system_nss.h', 2860 'browser/importer/nss_decryptor_system_nss.h',
2862 ]}, 2861 ]
2863 ], 2862 }],
2863 ['enable_app_list==1', {
2864 'dependencies': [
2865 '../ui/app_list/app_list.gyp:app_list',
2866 ]
2867 }],
2864 ], 2868 ],
2865 'target_conditions': [ 2869 'target_conditions': [
2866 # Need 'target_conditions' to override default filename_rules to include 2870 # Need 'target_conditions' to override default filename_rules to include
2867 # the files on Android. 2871 # the files on Android.
2868 ['OS=="android"', { 2872 ['OS=="android"', {
2869 'sources/': [ 2873 'sources/': [
2870 ['include', '^app/breakpad_linux\\.cc$'], 2874 ['include', '^app/breakpad_linux\\.cc$'],
2871 ['include', '^browser/crash_handler_host_linux\\.cc$'], 2875 ['include', '^browser/crash_handler_host_linux\\.cc$'],
2872 ['include', '^browser/crash_handler_host_linux_stub\\.cc$'], 2876 ['include', '^browser/crash_handler_host_linux_stub\\.cc$'],
2873 ], 2877 ],
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
3029 'proto_in_dir': '../third_party/cros_system_api/dbus', 3033 'proto_in_dir': '../third_party/cros_system_api/dbus',
3030 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 3034 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
3031 }, 3035 },
3032 'includes': ['../build/protoc.gypi'], 3036 'includes': ['../build/protoc.gypi'],
3033 }, 3037 },
3034 ], 3038 ],
3035 }, 3039 },
3036 ], 3040 ],
3037 ], 3041 ],
3038 } 3042 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/startup/startup_browser_creator_impl.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698