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

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: 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.lib',
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': [
175 'powrprof.dll', 179 'powrprof.dll',
176 ], 180 ],
(...skipping 1313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1490 'dependencies': [ 1494 'dependencies': [
1491 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1495 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1492 ], 1496 ],
1493 }], 1497 }],
1494 ], 1498 ],
1495 }, 1499 },
1496 ], 1500 ],
1497 }], 1501 }],
1498 ], 1502 ],
1499 } 1503 }
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