Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: adblockplus.gyp

Issue 6267413888761856: Issue #1163 - add unit tests for CPluginUserSettings (Closed)
Left Patch Set: Created Aug. 6, 2014, 3:55 p.m.
Right Patch Set: Created Oct. 7, 2014, 4:57 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | test/plugin/UserSettingsTest.cpp » ('j') | test/plugin/UserSettingsTest.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 { 1 {
2 'includes': ['defaults.gypi'], 2 'includes': ['defaults.gypi'],
3 3
4 'variables': { 4 'variables': {
5 'build_type%': 'devbuild', 5 'build_type%': 'devbuild',
6 'build_version%': '', 6 'build_version%': '',
7 }, 7 },
8 8
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 'src/plugin/SinkPolicy.inl', 143 'src/plugin/SinkPolicy.inl',
144 ], 144 ],
145 'include_dirs': [ 145 'include_dirs': [
146 '$(WindowsSDK_IncludePath)', 146 '$(WindowsSDK_IncludePath)',
147 '$(VCInstallDir)atlmfc/include', 147 '$(VCInstallDir)atlmfc/include',
148 '$(WINDDKDIR)/inc/atl71', 148 '$(WINDDKDIR)/inc/atl71',
149 ], 149 ],
150 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 150 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
151 # That Is Brought into a Process" on the link here: 151 # That Is Brought into a Process" on the link here:
152 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 152 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
153 'defines': ['PRODUCT_ADBLOCKPLUS', 'ISOLATION_AWARE_ENABLED'], 153 'defines': ['ISOLATION_AWARE_ENABLED'],
154 'libraries': [ 154 'libraries': [
155 '-lwinhttp', 155 '-lwinhttp',
156 '-lshell32', 156 '-lshell32',
157 '-lComctl32', 157 '-lComctl32',
158 '-lGdi32', 158 '-lGdi32',
159 ], 159 ],
160 'configurations': { 160 'configurations': {
161 # 'libraries' is not allowed under 'configurations' :-( 161 # 'libraries' is not allowed under 'configurations' :-(
162 'Debug': { 162 'Debug': {
163 'msvs_settings': { 163 'msvs_settings': {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 # 235 #
236 'src/plugin/AdblockPlusClient.cpp', 236 'src/plugin/AdblockPlusClient.cpp',
237 'src/plugin/AdblockPlusDomTraverser.cpp', 237 'src/plugin/AdblockPlusDomTraverser.cpp',
238 'src/plugin/AdblockPlusTab.cpp', 238 'src/plugin/AdblockPlusTab.cpp',
239 'src/plugin/ATL_Deprecate.cpp', 239 'src/plugin/ATL_Deprecate.cpp',
240 'src/plugin/NotificationMessage.cpp', 240 'src/plugin/NotificationMessage.cpp',
241 'src/plugin/Plugin.cpp', 241 'src/plugin/Plugin.cpp',
242 'src/plugin/PluginClientBase.cpp', 242 'src/plugin/PluginClientBase.cpp',
243 'src/plugin/PluginClientFactory.cpp', 243 'src/plugin/PluginClientFactory.cpp',
244 'src/plugin/PluginClass.cpp', 244 'src/plugin/PluginClass.cpp',
245 'src/plugin/PluginDebug.cpp',
245 'src/plugin/PluginFilter.cpp', 246 'src/plugin/PluginFilter.cpp',
246 'src/plugin/PluginMimeFilterClient.cpp', 247 'src/plugin/PluginMimeFilterClient.cpp',
247 'src/plugin/PluginMutex.cpp', 248 'src/plugin/PluginMutex.cpp',
248 'src/plugin/PluginSettings.cpp', 249 'src/plugin/PluginSettings.cpp',
249 'src/plugin/PluginSystem.cpp', 250 'src/plugin/PluginSystem.cpp',
250 'src/plugin/PluginTabBase.cpp', 251 'src/plugin/PluginTabBase.cpp',
251 'src/plugin/PluginUtil.cpp', 252 'src/plugin/PluginUtil.cpp',
252 'src/plugin/PluginWbPassthrough.cpp', 253 'src/plugin/PluginWbPassthrough.cpp',
253 ], 254 ],
254 'include_dirs': [ 255 'include_dirs': [
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 'Release': { 295 'Release': {
295 'msvs_settings': { 296 'msvs_settings': {
296 'VCLinkerTool': { 297 'VCLinkerTool': {
297 'AdditionalDependencies': ['atls.lib'], 298 'AdditionalDependencies': ['atls.lib'],
298 }, 299 },
299 }, 300 },
300 }, 301 },
301 }, 302 },
302 }] 303 }]
303 } 304 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld