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

Unified Diff: src/plugin/PluginTabBase.h

Issue 5948518908821504: Issue #1158 - removed unnecessary definitions and #ifdef/#else/#endif sections (Closed)
Patch Set: Created Aug. 6, 2014, 7:38 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/PluginTabBase.h
===================================================================
--- a/src/plugin/PluginTabBase.h
+++ b/src/plugin/PluginTabBase.h
@@ -1,10 +1,7 @@
#ifndef _PLUGIN_TAB_BASE_H_
#define _PLUGIN_TAB_BASE_H_
-
-#ifdef SUPPORT_DOM_TRAVERSER
class CPluginDomTraverser;
-#endif
#include "PluginUserSettings.h"
#include "PluginFilter.h"
@@ -35,34 +32,19 @@
std::thread m_thread;
std::atomic<bool> m_continueThreadRunning;
-
-#ifdef SUPPORT_DOM_TRAVERSER
CPluginDomTraverser* m_traverser;
-#endif
-
static int s_dictionaryVersion;
static int s_settingsVersion;
-#ifdef SUPPORT_FILTER
static int s_filterVersion;
public:
std::auto_ptr<CPluginFilter> m_filter;
private:
-#endif
-#ifdef SUPPORT_WHITELIST
static int s_whitelistVersion;
-#endif
-#ifdef SUPPORT_CONFIG
- static int s_configVersion;
-#endif
void ThreadProc();
-
-#ifdef SUPPORT_FRAME_CACHING
CComAutoCriticalSection m_criticalSectionCache;
std::set<CString> m_cacheFrames;
CString m_cacheDomain;
-#endif
-
void SetDocumentUrl(const CString& url);
void InjectABP(IWebBrowser2* browser);
public:
@@ -72,20 +54,15 @@
CString GetDocumentDomain();
CString GetDocumentUrl();
-
virtual void OnActivate();
virtual void OnUpdate();
virtual void OnNavigate(const CString& url);
virtual void OnDownloadComplete(IWebBrowser2* browser);
virtual void OnDocumentComplete(IWebBrowser2* browser, const CString& url, bool isDocumentBrowser);
-
static DWORD WINAPI TabThreadProc(LPVOID pParam);
-
-#ifdef SUPPORT_FRAME_CACHING
void CacheFrame(const CString& url);
bool IsFrameCached(const CString& url);
void ClearFrameCache(const CString& domain="");
-#endif
};

Powered by Google App Engine
This is Rietveld