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

Unified Diff: src/plugin/PluginTabBase.cpp

Issue 4895405913407488: Issue #1234 - remove CString from declarations representing domains. (Closed)
Patch Set: Created Aug. 7, 2014, 7:46 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 | « src/plugin/PluginTabBase.h ('k') | src/plugin/PluginWbPassThrough.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginTabBase.cpp
===================================================================
--- a/src/plugin/PluginTabBase.cpp
+++ b/src/plugin/PluginTabBase.cpp
@@ -86,7 +86,7 @@
{
void FilterLoader(CPluginTabBase* tabBase)
{
- tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain().GetString()));
+ tabBase->m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelectors(tabBase->GetDocumentDomain()));
SetEvent(tabBase->m_filter->hideFiltersLoadedEvent);
}
}
@@ -244,9 +244,9 @@
#endif
}
-CString CPluginTabBase::GetDocumentDomain()
+std::wstring CPluginTabBase::GetDocumentDomain()
{
- CString domain;
+ std::wstring domain;
m_criticalSection.Lock();
{
@@ -262,7 +262,7 @@
m_criticalSection.Lock();
{
m_documentUrl = url;
- m_documentDomain = CString(CAdblockPlusClient::GetInstance()->GetHostFromUrl(url.GetString()).c_str());
+ m_documentDomain = CAdblockPlusClient::GetInstance()->GetHostFromUrl(to_wstring(url));
}
m_criticalSection.Unlock();
}
@@ -309,11 +309,11 @@
m_criticalSectionCache.Unlock();
}
-void CPluginTabBase::ClearFrameCache(const CString& domain)
+void CPluginTabBase::ClearFrameCache(const std::wstring& domain)
{
m_criticalSectionCache.Lock();
{
- if (domain.IsEmpty() || domain != m_cacheDomain)
+ if (domain.empty() || domain != m_cacheDomain)
{
m_cacheFrames.clear();
m_cacheDomain = domain;
« no previous file with comments | « src/plugin/PluginTabBase.h ('k') | src/plugin/PluginWbPassThrough.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld