| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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 | 56 | 
| 57   int GetIEVersion(); |  | 
| 58 |  | 
| 59   bool Matches(const std::wstring& url, const std::wstring& contentType, const s
    td::wstring& domain); | 57   bool Matches(const std::wstring& url, const std::wstring& contentType, const s
    td::wstring& domain); | 
| 60   std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain
    ); | 58   std::vector<std::wstring> GetElementHidingSelectors(const std::wstring& domain
    ); | 
| 61   std::vector<SubscriptionDescription> FetchAvailableSubscriptions(); | 59   std::vector<SubscriptionDescription> FetchAvailableSubscriptions(); | 
| 62   std::vector<SubscriptionDescription> GetListedSubscriptions(); | 60   std::vector<SubscriptionDescription> GetListedSubscriptions(); | 
| 63   bool IsAcceptableAdsEnabled(); | 61   bool IsAcceptableAdsEnabled(); | 
| 64   void SetSubscription(const std::wstring& url); | 62   void SetSubscription(const std::wstring& url); | 
| 65   void AddSubscription(const std::wstring& url); | 63   void AddSubscription(const std::wstring& url); | 
| 66   void RemoveSubscription(const std::wstring& url); | 64   void RemoveSubscription(const std::wstring& url); | 
| 67   void UpdateAllSubscriptions(); | 65   void UpdateAllSubscriptions(); | 
| 68   std::vector<std::wstring> GetExceptionDomains(); | 66   std::vector<std::wstring> GetExceptionDomains(); | 
| 69   void AddFilter(const std::wstring& text); | 67   void AddFilter(const std::wstring& text); | 
| 70   void RemoveFilter(const std::wstring& text); | 68   void RemoveFilter(const std::wstring& text); | 
| 71   void SetPref(const std::wstring& name, const std::wstring& value); | 69   void SetPref(const std::wstring& name, const std::wstring& value); | 
| 72   void SetPref(const std::wstring& name, const int64_t& value); | 70   void SetPref(const std::wstring& name, const int64_t& value); | 
| 73   void SetPref(const std::wstring& name, bool value); | 71   void SetPref(const std::wstring& name, bool value); | 
| 74   std::wstring GetPref(const std::wstring& name, const std::wstring& defaultValu
    e = L""); | 72   std::wstring GetPref(const std::wstring& name, const std::wstring& defaultValu
    e = L""); | 
| 75   std::wstring GetPref(const std::wstring& name, const wchar_t* defaultValue); | 73   std::wstring GetPref(const std::wstring& name, const wchar_t* defaultValue); | 
| 76   bool GetPref(const std::wstring& name, bool defaultValue = false); | 74   bool GetPref(const std::wstring& name, bool defaultValue = false); | 
| 77   int64_t GetPref(const std::wstring& name, int64_t defaultValue = 0); | 75   int64_t GetPref(const std::wstring& name, int64_t defaultValue = 0); | 
| 78   void CheckForUpdates(HWND callbackWindow); | 76   void CheckForUpdates(HWND callbackWindow); | 
| 79   std::wstring GetAppLocale(); | 77   std::wstring GetAppLocale(); | 
| 80   std::wstring GetDocumentationLink(); | 78   std::wstring GetDocumentationLink(); | 
| 81   bool TogglePluginEnabled(); | 79   bool TogglePluginEnabled(); | 
| 82   std::wstring GetHostFromUrl(const std::wstring& url); | 80   std::wstring GetHostFromUrl(const std::wstring& url); | 
| 83 | 81 | 
| 84   bool IsFirstRun(); | 82   bool IsFirstRun(); | 
| 85 }; | 83 }; | 
| 86 | 84 | 
| 87 #endif // _ADBLOCK_PLUS_CLIENT_H_ | 85 #endif // _ADBLOCK_PLUS_CLIENT_H_ | 
| OLD | NEW | 
|---|