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

Side by Side Diff: src/plugin/AdblockPlusClient.cpp

Issue 4784041706389504: Issue 1183 - Fix Acceptable Ads hiding (Closed)
Patch Set: Addressed comments, reorganized the code Created Aug. 8, 2014, 4:37 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 #include "PluginSettings.h" 2 #include "PluginSettings.h"
3 #include "PluginSystem.h" 3 #include "PluginSystem.h"
4 #include "PluginFilter.h" 4 #include "PluginFilter.h"
5 #include "PluginClientFactory.h" 5 #include "PluginClientFactory.h"
6 #include "PluginMutex.h" 6 #include "PluginMutex.h"
7 #include "PluginClass.h" 7 #include "PluginClass.h"
8 8
9 #include "AdblockPlusClient.h" 9 #include "AdblockPlusClient.h"
10 10
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 if (!CallEngine(request, response)) 274 if (!CallEngine(request, response))
275 return false; 275 return false;
276 276
277 bool isWhitelisted; 277 bool isWhitelisted;
278 response >> isWhitelisted; 278 response >> isWhitelisted;
279 279
280 DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" end").c_str()); 280 DEBUG_GENERAL((L"IsWhitelistedUrl: " + url + L" end").c_str());
281 return isWhitelisted; 281 return isWhitelisted;
282 } 282 }
283 283
284 bool CAdblockPlusClient::IsHidingWhitelistedOnDomain(const std::wstring& domain)
Felix Dahlke 2014/08/08 16:41:45 s/Hiding/Elemhide? If you rename documentUrl in M
285 {
286 Communication::OutputBuffer request;
287 request << Communication::PROC_IS_ELEMHIDE_WHITELISTED_ON_URL << ToUtf8String( domain);
288
289 Communication::InputBuffer response;
290 if (!CallEngine(request, response))
291 return false;
292
293 bool isWhitelisted;
294 response >> isWhitelisted;
295 return isWhitelisted;
296 }
297
284 int CAdblockPlusClient::GetIEVersion() 298 int CAdblockPlusClient::GetIEVersion()
285 { 299 {
286 //HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer 300 //HKEY_LOCAL_MACHINE\Software\Microsoft\Internet Explorer
287 HKEY hKey; 301 HKEY hKey;
288 LSTATUS status = RegOpenKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Interne t Explorer", &hKey); 302 LSTATUS status = RegOpenKey(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Interne t Explorer", &hKey);
289 if (status != 0) 303 if (status != 0)
290 { 304 {
291 return 0; 305 return 0;
292 } 306 }
293 DWORD type, cbData; 307 DWORD type, cbData;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 DEBUG_GENERAL("CompareVersions"); 578 DEBUG_GENERAL("CompareVersions");
565 Communication::OutputBuffer request; 579 Communication::OutputBuffer request;
566 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S tring(v2); 580 request << Communication::PROC_COMPARE_VERSIONS << ToUtf8String(v1) << ToUtf8S tring(v2);
567 Communication::InputBuffer response; 581 Communication::InputBuffer response;
568 if (!CallEngine(request, response)) 582 if (!CallEngine(request, response))
569 return 0; 583 return 0;
570 int result; 584 int result;
571 response >> result; 585 response >> result;
572 return result; 586 return result;
573 } 587 }
OLDNEW

Powered by Google App Engine
This is Rietveld