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

Delta Between Two Patch Sets: src/plugin/AdblockPlusClient.h

Issue 4784041706389504: Issue 1183 - Fix Acceptable Ads hiding (Closed)
Left Patch Set: Addressed comments, reorganized the code Created Aug. 8, 2014, 4:37 p.m.
Right Patch Set: More addressing comments Created Aug. 8, 2014, 4:54 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 | « src/engine/Main.cpp ('k') | src/plugin/AdblockPlusClient.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 #ifndef _ADBLOCK_PLUS_CLIENT_H_ 1 #ifndef _ADBLOCK_PLUS_CLIENT_H_
2 #define _ADBLOCK_PLUS_CLIENT_H_ 2 #define _ADBLOCK_PLUS_CLIENT_H_
3 3
4 4
5 #include "PluginTypedef.h" 5 #include "PluginTypedef.h"
6 #include "PluginClientBase.h" 6 #include "PluginClientBase.h"
7 #include "../shared/Communication.h" 7 #include "../shared/Communication.h"
8 #include "../shared/CriticalSection.h" 8 #include "../shared/CriticalSection.h"
9 9
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 ~CAdblockPlusClient(); 46 ~CAdblockPlusClient();
47 47
48 static CAdblockPlusClient* GetInstance(); 48 static CAdblockPlusClient* GetInstance();
49 49
50 // Removes the url from the list of whitelisted urls if present 50 // Removes the url from the list of whitelisted urls if present
51 // Only called from ui thread 51 // Only called from ui thread
52 bool ShouldBlock(CString src, int contentType, const CString& domain, bool add Debug=false); 52 bool ShouldBlock(CString src, int contentType, const CString& domain, bool add Debug=false);
53 53
54 bool IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& dom ain, const CString& indent, CPluginFilter* filter); 54 bool IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& dom ain, const CString& indent, CPluginFilter* filter);
55 bool IsWhitelistedUrl(const std::wstring& url); 55 bool IsWhitelistedUrl(const std::wstring& url);
56 bool IsHidingWhitelistedOnDomain(const std::wstring& domain); 56 bool IsElemhideWhitelistedOnDomain(const std::wstring& url);
57 57
58 int GetIEVersion(); 58 int GetIEVersion();
59 59
60 bool Matches(const std::wstring& url, const std::wstring& contentType, const s td::wstring& domain); 60 bool Matches(const std::wstring& url, const std::wstring& contentType, const s td::wstring& domain);
61 std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain ); 61 std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain );
62 std::vector<SubscriptionDescription> FetchAvailableSubscriptions(); 62 std::vector<SubscriptionDescription> FetchAvailableSubscriptions();
63 std::vector<SubscriptionDescription> GetListedSubscriptions(); 63 std::vector<SubscriptionDescription> GetListedSubscriptions();
64 bool IsAcceptableAdsEnabled(); 64 bool IsAcceptableAdsEnabled();
65 void SetSubscription(const std::wstring& url); 65 void SetSubscription(const std::wstring& url);
66 void AddSubscription(const std::wstring& url); 66 void AddSubscription(const std::wstring& url);
(...skipping 13 matching lines...) Expand all
80 std::wstring GetAppLocale(); 80 std::wstring GetAppLocale();
81 std::wstring GetDocumentationLink(); 81 std::wstring GetDocumentationLink();
82 bool TogglePluginEnabled(); 82 bool TogglePluginEnabled();
83 std::wstring GetHostFromUrl(const std::wstring& url); 83 std::wstring GetHostFromUrl(const std::wstring& url);
84 int CompareVersions(const std::wstring& v1, const std::wstring& v2); 84 int CompareVersions(const std::wstring& v1, const std::wstring& v2);
85 85
86 bool IsFirstRun(); 86 bool IsFirstRun();
87 }; 87 };
88 88
89 #endif // _ADBLOCK_PLUS_CLIENT_H_ 89 #endif // _ADBLOCK_PLUS_CLIENT_H_
LEFTRIGHT

Powered by Google App Engine
This is Rietveld