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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 3855004: Make USE_OPENSSL and USE_NSS mutually exclusive (Closed)
Patch Set: wtc comments Created 10 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
« no previous file with comments | « chrome/browser/sync/util/nigori.cc ('k') | chrome/common/pref_names.h » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 4055 matching lines...) Expand 10 before | Expand all | Expand 10 after
4066 'browser/bookmarks/bookmark_menu_controller.h', 4066 'browser/bookmarks/bookmark_menu_controller.h',
4067 'browser/extensions/extension_tts_api_win.cc', 4067 'browser/extensions/extension_tts_api_win.cc',
4068 'browser/google/google_update.cc', 4068 'browser/google/google_update.cc',
4069 'browser/history/history_indexer.idl', 4069 'browser/history/history_indexer.idl',
4070 'browser/history_tab_ui.cc', 4070 'browser/history_tab_ui.cc',
4071 'browser/history_view.cc', 4071 'browser/history_view.cc',
4072 'browser/ime_input.cc', 4072 'browser/ime_input.cc',
4073 'browser/importer/ie_importer.cc', 4073 'browser/importer/ie_importer.cc',
4074 ], 4074 ],
4075 }], 4075 }],
4076 [ 'use_openssl==1', {
4077 'sources!': [
4078 'browser/importer/nss_decryptor.cc',
4079 'browser/importer/nss_decryptor_system_nss.cc',
4080 'browser/importer/nss_decryptor_system_nss.h',
4081 ],
4082 }],
4076 ], 4083 ],
4077 }, 4084 },
4078 { 4085 {
4079 'target_name': 'component_extensions', 4086 'target_name': 'component_extensions',
4080 'type': 'none', 4087 'type': 'none',
4081 'msvs_guid': '50B52703-525F-404C-BFE2-C46D3375D73E', 4088 'msvs_guid': '50B52703-525F-404C-BFE2-C46D3375D73E',
4082 'conditions': [ 4089 'conditions': [
4083 ['OS=="linux" and chromeos==1 and branding=="Chrome"',{ 4090 ['OS=="linux" and chromeos==1 and branding=="Chrome"',{
4084 'copies': [ 4091 'copies': [
4085 { 4092 {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
4160 ], 4167 ],
4161 }, 4168 },
4162 ], 4169 ],
4163 } 4170 }
4164 4171
4165 # Local Variables: 4172 # Local Variables:
4166 # tab-width:2 4173 # tab-width:2
4167 # indent-tabs-mode:nil 4174 # indent-tabs-mode:nil
4168 # End: 4175 # End:
4169 # vim: set expandtab tabstop=2 shiftwidth=2: 4176 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/sync/util/nigori.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698