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

Unified Diff: src/plugin/PluginWbPassThrough.cpp

Issue 5171515343503360: Issue #41 - Bring method of determining IE version up to date (Closed)
Patch Set: simplify Registry_Key Created July 26, 2014, 5 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
Index: src/plugin/PluginWbPassThrough.cpp
===================================================================
--- a/src/plugin/PluginWbPassThrough.cpp
+++ b/src/plugin/PluginWbPassThrough.cpp
@@ -9,7 +9,7 @@
#include "PluginSettings.h"
#include "PluginClass.h"
#include "PluginSystem.h"
-
+#include "../shared/IE_version.h"
#include "wtypes.h"
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
@@ -96,7 +96,7 @@
{
// No referer or mime type
// BINDSTRING_XDR_ORIGIN works only for IE v8+
- if (mimeType.IsEmpty() && domain.IsEmpty() && CPluginClient::GetInstance()->GetIEVersion() >= 8)
+ if (mimeType.IsEmpty() && domain.IsEmpty() && AdblockPlus::IE::installed_major_version() >= 8)
sergei 2014/07/28 11:46:27 Just wonder, what happens if we throw an exception
Eric 2014/07/29 12:42:25 As of today, the exception will propagate up throu
sergei 2014/07/29 14:45:56 I cannot say, that I'm happy having such call here
Eric 2014/07/29 15:17:22 How was it clear that the previous code didn't thr
{
return CFilter::contentTypeXmlHttpRequest;
}
@@ -235,7 +235,7 @@
#endif
//Fixes the iframe back button issue
- if (client->GetIEVersion() > 6)
+ if (AdblockPlus::IE::installed_major_version() > 6)
{
if ((contentType == CFilter::contentTypeImage) && (isBlocked))
{

Powered by Google App Engine
This is Rietveld