Side by Side Diff: src/plugin/AdblockPlusClient.h
Issue 6299667012780032:
Issues #696,1231,1264,1265 - Improve handling in PassthroughApp (Closed)
Patch Set: Get rid of yoda style and rename blockedByABPPageSize local var
Created Sept. 22, 2014, 4:14 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
src/plugin/AdblockPlusClient.cpp » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 public: | 42 public: |
| 43 | 43 |
| 44 static CAdblockPlusClient* s_instance; | 44 static CAdblockPlusClient* s_instance; |
| 45 | 45 |
| 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(const CString& src, int contentType, const CString& domain, b ool addDebug=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 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(); |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 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_ |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
src/plugin/AdblockPlusClient.cpp » ('j')
|
no next file with comments »
