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

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

Issue 4784041706389504: Issue 1183 - Fix Acceptable Ads hiding (Closed)
Patch Set: Addressed comments, reorganized the code Created Aug. 8, 2014, 4:37 p.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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 DEBUG_GENERAL("Invoke"); 176 DEBUG_GENERAL("Invoke");
177 if (FAILED(hr)) 177 if (FAILED(hr))
178 { 178 {
179 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT, PLUGIN_ERROR_CR EATE_SETTINGS_JAVASCRIPT_INVOKE, "CPluginTabBase::InjectABP - Failed to create S ettings in JavaScript"); 179 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_CREATE_SETTINGS_JAVASCRIPT, PLUGIN_ERROR_CR EATE_SETTINGS_JAVASCRIPT_INVOKE, "CPluginTabBase::InjectABP - Failed to create S ettings in JavaScript");
180 } 180 }
181 } 181 }
182 182
183 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser) 183 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser)
184 { 184 {
185 #ifdef SUPPORT_DOM_TRAVERSER 185 #ifdef SUPPORT_DOM_TRAVERSER
186 if (!CPluginClient::GetInstance()->IsWhitelistedUrl(std::wstring(GetDocumentUr l()))) 186 CPluginClient* client = CPluginClient::GetInstance();
187 if (!client->IsWhitelistedUrl(std::wstring(GetDocumentUrl())) && !client->IsHi dingWhitelistedOnDomain(std::wstring(GetDocumentUrl())))
Felix Dahlke 2014/08/08 16:41:45 std::wstring(GetDocumentUrl()) would like to be a
187 { 188 {
188 m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl() ); 189 m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl() );
189 } 190 }
190 #endif // SUPPORT_DOM_TRAVERSER 191 #endif // SUPPORT_DOM_TRAVERSER
191 192
192 InjectABP(browser); 193 InjectABP(browser);
193 } 194 }
194 195
195 void CPluginTabBase::OnDocumentComplete(IWebBrowser2* browser, const CString& ur l, bool isDocumentBrowser) 196 void CPluginTabBase::OnDocumentComplete(IWebBrowser2* browser, const CString& ur l, bool isDocumentBrowser)
196 { 197 {
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError. GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), tr ue, pluginError.GetProcessId(), pluginError.GetThreadId()); 387 CPluginClient::LogPluginError(pluginError.GetErrorCode(), pluginError. GetErrorId(), pluginError.GetErrorSubid(), pluginError.GetErrorDescription(), tr ue, pluginError.GetProcessId(), pluginError.GetThreadId());
387 } 388 }
388 389
389 // Non-hanging sleep 390 // Non-hanging sleep
390 Sleep(50); 391 Sleep(50);
391 } 392 }
392 393
393 tabLoopIteration++; 394 tabLoopIteration++;
394 } 395 }
395 } 396 }
OLDNEW

Powered by Google App Engine
This is Rietveld