Delta Between Two Patch Sets: src/plugin/PluginTabBase.cpp
Issue 11292028:
Status bar menu added (Closed)
Left Patch Set:
Created July 29, 2013, 5:25 a.m.
Right Patch Set: Comments addressed
Created Aug. 5, 2013, 1:13 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginUtil.h » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelect ors(domainString)); | 96 m_filter->LoadHideFilters(CPluginClient::GetInstance()->GetElementHidingSelect ors(domainString)); |
| 97 | 97 |
| 98 #ifdef SUPPORT_DOM_TRAVERSER | 98 #ifdef SUPPORT_DOM_TRAVERSER |
| 99 m_traverser->ClearCache(); | 99 m_traverser->ClearCache(); |
| 100 #endif | 100 #endif |
| 101 } | 101 } |
| 102 | 102 |
| 103 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser) | 103 void CPluginTabBase::OnDownloadComplete(IWebBrowser2* browser) |
| 104 { | 104 { |
| 105 #ifdef SUPPORT_DOM_TRAVERSER | 105 #ifdef SUPPORT_DOM_TRAVERSER |
| 106 m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl()); | 106 if (!CPluginClient::GetInstance()->IsWhitelistedUrl(std::wstring(GetDocumentUr l()))) |
| 107 { | |
| 108 m_traverser->TraverseDocument(browser, GetDocumentDomain(), GetDocumentUrl() ); | |
| 109 } | |
| 107 #endif // SUPPORT_DOM_TRAVERSER | 110 #endif // SUPPORT_DOM_TRAVERSER |
| 108 } | 111 } |
| 109 | 112 |
| 110 | 113 |
| 111 void CPluginTabBase::OnDocumentComplete(IWebBrowser2* browser, const CString& ur l, bool isDocumentBrowser) | 114 void CPluginTabBase::OnDocumentComplete(IWebBrowser2* browser, const CString& ur l, bool isDocumentBrowser) |
| 112 { | 115 { |
| 113 CString documentUrl = GetDocumentUrl(); | 116 CString documentUrl = GetDocumentUrl(); |
| 114 | 117 |
| 115 if (isDocumentBrowser) | 118 if (isDocumentBrowser) |
| 116 { | 119 { |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 347 | 350 |
| 348 // Non-hanging sleep | 351 // Non-hanging sleep |
| 349 Sleep(50); | 352 Sleep(50); |
| 350 } | 353 } |
| 351 | 354 |
| 352 tabLoopIteration++; | 355 tabLoopIteration++; |
| 353 } | 356 } |
| 354 | 357 |
| 355 return 0; | 358 return 0; |
| 356 } | 359 } |
| LEFT | RIGHT |
« src/plugin/PluginSettings.cpp ('k')
|
src/plugin/PluginUtil.h » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
