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

Unified Diff: src/plugin/AdblockPlusClient.h

Issue 5163396739629056: Issue #1234 - Remove CString from ShouldBlock(), IsElementHidden() declarations (Closed)
Patch Set: Created Aug. 7, 2014, 2:20 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/plugin/AdblockPlusClient.cpp » ('j') | src/plugin/PluginFilter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/AdblockPlusClient.h
===================================================================
--- a/src/plugin/AdblockPlusClient.h
+++ b/src/plugin/AdblockPlusClient.h
@@ -28,7 +28,7 @@
CComAutoCriticalSection m_criticalSectionFilter;
CComAutoCriticalSection m_criticalSectionCache;
- std::map<CString,bool> m_cacheBlockedSources;
+ std::map<std::wstring,bool> m_cacheBlockedSources;
Felix Dahlke 2014/09/30 13:30:15 Good time as any to add a space after the comma he
Eric 2014/09/30 17:56:40 Done.
std::shared_ptr<Communication::Pipe> enginePipe;
CriticalSection enginePipeLock;
@@ -49,9 +49,9 @@
// Removes the url from the list of whitelisted urls if present
// Only called from ui thread
- bool ShouldBlock(CString src, int contentType, const CString& domain, bool addDebug=false);
+ bool ShouldBlock(const std::wstring& src, int contentType, const std::wstring& domain, bool addDebug=false);
- bool IsElementHidden(const CString& tag, IHTMLElement* pEl, const CString& domain, const CString& indent, CPluginFilter* filter);
+ bool IsElementHidden(const std::wstring& tag, IHTMLElement* pEl, const std::wstring& domain, const std::wstring& indent, CPluginFilter* filter);
bool IsWhitelistedUrl(const std::wstring& url);
int GetIEVersion();
« no previous file with comments | « no previous file | src/plugin/AdblockPlusClient.cpp » ('j') | src/plugin/PluginFilter.cpp » ('J')

Powered by Google App Engine
This is Rietveld