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

Side by Side Diff: base/base.gyp

Issue 644783005: The DisplayVirtualKeyboard function on Windows 8 and beyond should not be displaying the OSK if a p… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed views_unittests 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 ], 153 ],
154 }, 154 },
155 }], 155 }],
156 ], 156 ],
157 }], 157 }],
158 ['OS == "win"', { 158 ['OS == "win"', {
159 # Specify delayload for base.dll. 159 # Specify delayload for base.dll.
160 'msvs_settings': { 160 'msvs_settings': {
161 'VCLinkerTool': { 161 'VCLinkerTool': {
162 'DelayLoadDLLs': [ 162 'DelayLoadDLLs': [
163 'cfgmgr32.dll',
163 'powrprof.dll', 164 'powrprof.dll',
165 'setupapi.dll',
164 ], 166 ],
165 'AdditionalDependencies': [ 167 'AdditionalDependencies': [
168 'cfgmgr32.lib',
166 'powrprof.lib', 169 'powrprof.lib',
170 'setupapi.lib',
167 ], 171 ],
168 }, 172 },
169 }, 173 },
170 # Specify delayload for components that link with base.lib. 174 # Specify delayload for components that link with base.lib.
171 'all_dependent_settings': { 175 'all_dependent_settings': {
172 'msvs_settings': { 176 'msvs_settings': {
173 'VCLinkerTool': { 177 'VCLinkerTool': {
174 'DelayLoadDLLs': [ 178 'DelayLoadDLLs': [
179 'cfgmgr32.dll',
175 'powrprof.dll', 180 'powrprof.dll',
181 'setupapi.dll',
176 ], 182 ],
177 'AdditionalDependencies': [ 183 'AdditionalDependencies': [
184 'cfgmgr32.lib',
178 'powrprof.lib', 185 'powrprof.lib',
186 'setupapi.lib',
179 ], 187 ],
180 }, 188 },
181 }, 189 },
182 }, 190 },
183 }], 191 }],
184 ['OS == "mac" or (OS == "ios" and _toolset == "host")', { 192 ['OS == "mac" or (OS == "ios" and _toolset == "host")', {
185 'link_settings': { 193 'link_settings': {
186 'libraries': [ 194 'libraries': [
187 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 195 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
188 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k', 196 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k',
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 ['component == "shared_library"', { 1073 ['component == "shared_library"', {
1066 'sources!': [ 1074 'sources!': [
1067 'debug/debug_on_start_win.cc', 1075 'debug/debug_on_start_win.cc',
1068 ], 1076 ],
1069 }], 1077 }],
1070 ], 1078 ],
1071 # Specify delayload for base_win64.dll. 1079 # Specify delayload for base_win64.dll.
1072 'msvs_settings': { 1080 'msvs_settings': {
1073 'VCLinkerTool': { 1081 'VCLinkerTool': {
1074 'DelayLoadDLLs': [ 1082 'DelayLoadDLLs': [
1083 'cfgmgr32.dll',
1075 'powrprof.dll', 1084 'powrprof.dll',
1085 'setupapi.dll',
1076 ], 1086 ],
1077 'AdditionalDependencies': [ 1087 'AdditionalDependencies': [
1088 'cfgmgr32.lib',
1078 'powrprof.lib', 1089 'powrprof.lib',
1090 'setupapi.lib',
1079 ], 1091 ],
1080 }, 1092 },
1081 }, 1093 },
1082 # Specify delayload for components that link with base_win64.lib. 1094 # Specify delayload for components that link with base_win64.lib.
1083 'all_dependent_settings': { 1095 'all_dependent_settings': {
1084 'msvs_settings': { 1096 'msvs_settings': {
1085 'VCLinkerTool': { 1097 'VCLinkerTool': {
1086 'DelayLoadDLLs': [ 1098 'DelayLoadDLLs': [
1099 'cfgmgr32.dll',
1087 'powrprof.dll', 1100 'powrprof.dll',
1101 'setupapi.dll',
1088 ], 1102 ],
1089 'AdditionalDependencies': [ 1103 'AdditionalDependencies': [
1104 'cfgmgr32.lib',
1090 'powrprof.lib', 1105 'powrprof.lib',
1106 'setupapi.lib',
1091 ], 1107 ],
1092 }, 1108 },
1093 }, 1109 },
1094 }, 1110 },
1095 # TODO(rvargas): Bug 78117. Remove this. 1111 # TODO(rvargas): Bug 78117. Remove this.
1096 'msvs_disabled_warnings': [ 1112 'msvs_disabled_warnings': [
1097 4244, 1113 4244,
1098 4996, 1114 4996,
1099 4267, 1115 4267,
1100 ], 1116 ],
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1492 'dependencies': [ 1508 'dependencies': [
1493 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1509 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1494 ], 1510 ],
1495 }], 1511 }],
1496 ], 1512 ],
1497 }, 1513 },
1498 ], 1514 ],
1499 }], 1515 }],
1500 ], 1516 ],
1501 } 1517 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | base/win/win_util.cc » ('j') | base/win/win_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698