Side by Side Diff: src/plugin/PluginWbPassThrough.cpp
Issue 5171515343503360:
Issue #41 - Bring method of determining IE version up to date (Closed)
Patch Set: Final (?)
Created Jan. 4, 2015, 11:02 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/shared/IE_version.h » ('j')
|
no next file with comments »
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')
| OLD | NEW |
|---|---|
| 1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
| 2 | 2 |
| 3 #include "PluginWbPassThrough.h" | 3 #include "PluginWbPassThrough.h" |
| 4 #include "PluginClient.h" | 4 #include "PluginClient.h" |
| 5 #include "PluginClientFactory.h" | 5 #include "PluginClientFactory.h" |
| 6 #include "PluginFilter.h" | 6 #include "PluginFilter.h" |
| 7 #include "PluginSettings.h" | 7 #include "PluginSettings.h" |
| 8 #include "PluginClass.h" | 8 #include "PluginClass.h" |
| 9 #include "PluginSystem.h" | 9 #include "PluginSystem.h" |
| 10 #include <WinInet.h> | 10 #include <WinInet.h> |
| 11 #include "wtypes.h" | 11 #include "wtypes.h" |
| 12 #include "../shared/Utils.h" | 12 #include "../shared/Utils.h" |
| 13 <Merge Conflict>#include "../shared/IE_version.h" | |
|
sergei
2015/01/05 12:24:23
"Merge Conflict"
Do we need this header here?
Eric
2015/01/05 13:08:21
And this is why I dislike rebase.
The relevant ch
| |
| 13 | 14 |
| 14 namespace | 15 namespace |
| 15 { | 16 { |
| 16 const std::string g_blockedByABPPage = "<!DOCTYPE html>" | 17 const std::string g_blockedByABPPage = "<!DOCTYPE html>" |
| 17 "<html>" | 18 "<html>" |
| 18 "<body>" | 19 "<body>" |
| 19 "<!-- blocked by AdblockPlus -->" | 20 "<!-- blocked by AdblockPlus -->" |
| 20 "</body>" | 21 "</body>" |
| 21 "</html>"; | 22 "</html>"; |
| 22 | 23 |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 388 } | 389 } |
| 389 | 390 |
| 390 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne tProtocol); | 391 return OnStart(szUrl, pOIProtSink, pOIBindInfo, grfPI, dwReserved, m_spInterne tProtocol); |
| 391 } | 392 } |
| 392 | 393 |
| 393 STDMETHODIMP WBPassthru::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [o ut] */ ULONG *pcbRead) | 394 STDMETHODIMP WBPassthru::Read(/* [in, out] */ void *pv,/* [in] */ ULONG cb,/* [o ut] */ ULONG *pcbRead) |
| 394 { | 395 { |
| 395 WBPassthruSink* pSink = GetSink(); | 396 WBPassthruSink* pSink = GetSink(); |
| 396 return pSink->OnRead(pv, cb, pcbRead); | 397 return pSink->OnRead(pv, cb, pcbRead); |
| 397 } | 398 } |
| OLD | NEW |
« no previous file with comments
|
« src/plugin/PluginTabBase.cpp ('k')
|
src/shared/IE_version.h » ('j')
|
no next file with comments »
