src/plugin/AdblockPlusClient.h - Issue 4784041706389504: Issue 1183 - Fix Acceptable Ads hiding

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

Issue 4784041706389504: Issue 1183 - Fix Acceptable Ads hiding (Closed)

Left Patch Set: Created Aug. 8, 2014, 3:51 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

LEFT	RIGHT
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 Loading...
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 IsElemhideWhitelistedOnDomain(const std::wstring& url);

56	57

57 int GetIEVersion();	58 int GetIEVersion();

58	59

59 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);

60 bool HidingEnabledOnDomain(const std::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);

67 void RemoveSubscription(const std::wstring& url);	67 void RemoveSubscription(const std::wstring& url);

68 void UpdateAllSubscriptions();	68 void UpdateAllSubscriptions();

69 std::vector<std::wstring> GetExceptionDomains();	69 std::vector<std::wstring> GetExceptionDomains();

70 void AddFilter(const std::wstring& text);	70 void AddFilter(const std::wstring& text);

71 void RemoveFilter(const std::wstring& text);	71 void RemoveFilter(const std::wstring& text);

72 void SetPref(const std::wstring& name, const std::wstring& value);	72 void SetPref(const std::wstring& name, const std::wstring& value);

73 void SetPref(const std::wstring& name, const int64_t& value);	73 void SetPref(const std::wstring& name, const int64_t& value);

74 void SetPref(const std::wstring& name, bool value);	74 void SetPref(const std::wstring& name, bool value);

75 std::wstring GetPref(const std::wstring& name, const std::wstring& defaultValu e = L"");	75 std::wstring GetPref(const std::wstring& name, const std::wstring& defaultValu e = L"");

76 std::wstring GetPref(const std::wstring& name, const wchar_t* defaultValue);	76 std::wstring GetPref(const std::wstring& name, const wchar_t* defaultValue);

77 bool GetPref(const std::wstring& name, bool defaultValue = false);	77 bool GetPref(const std::wstring& name, bool defaultValue = false);

78 int64_t GetPref(const std::wstring& name, int64_t defaultValue = 0);	78 int64_t GetPref(const std::wstring& name, int64_t defaultValue = 0);

79 void CheckForUpdates(HWND callbackWindow);	79 void CheckForUpdates(HWND callbackWindow);

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_

LEFT	RIGHT