src/plugin/AdblockPlusClient.h - Issue 5115380229996544: Issue 1104 - Cannot uncheck Disable on website option in tool bar

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

Issue 5115380229996544: Issue 1104 - Cannot uncheck Disable on website option in tool bar (Closed)

Patch Set: rename and rebase Created March 13, 2015, 4:48 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

« no previous file with comments | « src/engine/Main.cpp ('k') | src/plugin/AdblockPlusClient.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * This file is part of Adblock Plus <https://adblockplus.org/>,	2 * This file is part of Adblock Plus <https://adblockplus.org/>,

3 * Copyright (C) 2006-2015 Eyeo GmbH	3 * Copyright (C) 2006-2015 Eyeo GmbH

4 *	4 *

5 * Adblock Plus is free software: you can redistribute it and/or modify	5 * Adblock Plus is free software: you can redistribute it and/or modify

6 * it under the terms of the GNU General Public License version 3 as	6 * it under the terms of the GNU General Public License version 3 as

7 * published by the Free Software Foundation.	7 * published by the Free Software Foundation.

8 *	8 *

9 * Adblock Plus is distributed in the hope that it will be useful,	9 * Adblock Plus is distributed in the hope that it will be useful,

10 * but WITHOUT ANY WARRANTY; without even the implied warranty of	10 * but WITHOUT ANY WARRANTY; without even the implied warranty of

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 ~CAdblockPlusClient();	65 ~CAdblockPlusClient();

66	66

67 static CAdblockPlusClient* GetInstance();	67 static CAdblockPlusClient* GetInstance();

68	68

69 // Removes the url from the list of whitelisted urls if present	69 // Removes the url from the list of whitelisted urls if present

70 // Only called from ui thread	70 // Only called from ui thread

71 bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentTy pe contentType, const std::wstring& domain, bool addDebug=false);	71 bool ShouldBlock(const std::wstring& src, AdblockPlus::FilterEngine::ContentTy pe contentType, const std::wstring& domain, bool addDebug=false);

72	72

73 bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::ws tring& domain, const std::wstring& indent, CPluginFilter* filter);	73 bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::ws tring& domain, const std::wstring& indent, CPluginFilter* filter);

74 bool IsWhitelistedUrl(const std::wstring& url);	74 bool IsWhitelistedUrl(const std::wstring& url);

	75 std::string GetWhitelistingFilter(const std::wstring& url);

75 bool IsElemhideWhitelistedOnDomain(const std::wstring& url);	76 bool IsElemhideWhitelistedOnDomain(const std::wstring& url);

76	77

77 bool Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType c ontentType, const std::wstring& domain);	78 bool Matches(const std::wstring& url, AdblockPlus::FilterEngine::ContentType c ontentType, const std::wstring& domain);

78 std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain );	79 std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain );

79 std::vector<SubscriptionDescription> FetchAvailableSubscriptions();	80 std::vector<SubscriptionDescription> FetchAvailableSubscriptions();

80 std::vector<SubscriptionDescription> GetListedSubscriptions();	81 std::vector<SubscriptionDescription> GetListedSubscriptions();

81 bool IsAcceptableAdsEnabled();	82 bool IsAcceptableAdsEnabled();

82 void SetSubscription(const std::wstring& url);	83 void SetSubscription(const std::wstring& url);

83 void AddSubscription(const std::wstring& url);	84 void AddSubscription(const std::wstring& url);

84 void RemoveSubscription(const std::wstring& url);	85 void RemoveSubscription(const std::wstring& url);

85 void UpdateAllSubscriptions();	86 void UpdateAllSubscriptions();

86 std::vector<std::wstring> GetExceptionDomains();	87 std::vector<std::wstring> GetExceptionDomains();

87 void AddFilter(const std::wstring& text);	88 void AddFilter(const std::wstring& text);

88 void RemoveFilter(const std::wstring& text);	89 void RemoveFilter(const std::wstring& text);

	90 void RemoveFilter(const std::string& text);

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

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

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

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

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

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

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

96 void CheckForUpdates(HWND callbackWindow);	98 void CheckForUpdates(HWND callbackWindow);

97 std::wstring GetAppLocale();	99 std::wstring GetAppLocale();

98 std::wstring GetDocumentationLink();	100 std::wstring GetDocumentationLink();

99 bool TogglePluginEnabled();	101 bool TogglePluginEnabled();

100 std::wstring GetHostFromUrl(const std::wstring& url);	102 std::wstring GetHostFromUrl(const std::wstring& url);

101 int CompareVersions(const std::wstring& v1, const std::wstring& v2);	103 int CompareVersions(const std::wstring& v1, const std::wstring& v2);

102	104

103 bool IsFirstRun();	105 bool IsFirstRun();

104 };	106 };

105	107

106 #endif // _ADBLOCK_PLUS_CLIENT_H_	108 #endif // _ADBLOCK_PLUS_CLIENT_H_

OLD	NEW