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

Side by Side Diff: src/plugin/PluginTabBase.cpp

Issue 11062004: Don't use std::string in the plugin, convert when communicating with the engine (Closed)
Patch Set: Created June 27, 2013, 10:37 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginClient.h" 3 #include "PluginClient.h"
4 #include "PluginSettings.h" 4 #include "PluginSettings.h"
5 #ifdef SUPPORT_CONFIG 5 #ifdef SUPPORT_CONFIG
6 #include "PluginConfig.h" 6 #include "PluginConfig.h"
7 #endif 7 #endif
8 #include "PluginTab.h" 8 #include "PluginTab.h"
9 #include "PluginDomTraverser.h" 9 #include "PluginDomTraverser.h"
10 #include "PluginClass.h" 10 #include "PluginClass.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 void CPluginTabBase::OnNavigate(const CString& url) 139 void CPluginTabBase::OnNavigate(const CString& url)
140 { 140 {
141 SetDocumentUrl(url); 141 SetDocumentUrl(url);
142 142
143 143
144 #ifdef SUPPORT_FRAME_CACHING 144 #ifdef SUPPORT_FRAME_CACHING
145 ClearFrameCache(GetDocumentDomain()); 145 ClearFrameCache(GetDocumentDomain());
146 #endif 146 #endif
147 147
148 std::string domainString = CT2A(GetDocumentDomain()); 148 std::wstring domainString = GetDocumentDomain();
149 m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelect ors(domainString)); 149 m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelect ors(domainString));
150 150
151 #ifdef SUPPORT_DOM_TRAVERSER 151 #ifdef SUPPORT_DOM_TRAVERSER
152 m_traverser->ClearCache(); 152 m_traverser->ClearCache();
153 #endif 153 #endif
154 } 154 }
155 155
156 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser) 156 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser)
157 { 157 {
158 #ifdef SUPPORT_DOM_TRAVERSER 158 #ifdef SUPPORT_DOM_TRAVERSER
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 443
444 // Non-hanging sleep 444 // Non-hanging sleep
445 Sleep(50); 445 Sleep(50);
446 } 446 }
447 447
448 tabLoopIteration++; 448 tabLoopIteration++;
449 } 449 }
450 450
451 return 0; 451 return 0;
452 } 452 }
OLDNEW

Powered by Google App Engine
This is Rietveld