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

Unified Diff: src/plugin/PluginTabBase.h

Issue 29331767: Issue #1234 + Clean up - CPluginTab (dead code, nullptr defect fix, etc.) (Closed)
Patch Set: Created Dec. 2, 2015, 6:35 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
« no previous file with comments | « src/plugin/PluginDomTraverserBase.h ('k') | src/plugin/PluginTabBase.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginTabBase.h
===================================================================
--- a/src/plugin/PluginTabBase.h
+++ b/src/plugin/PluginTabBase.h
@@ -26,45 +26,34 @@
#include <thread>
#include <atomic>
-class CPluginClass;
-
-
class CPluginTabBase
{
-
- friend class CPluginClass;
-
-protected:
-
CComAutoCriticalSection m_criticalSection;
CriticalSection m_csInject;
std::wstring m_documentDomain;
std::wstring m_documentUrl;
CPluginUserSettings m_pluginUserSettings;
-public:
- CPluginClass* m_plugin;
-protected:
bool m_isActivated;
std::thread m_thread;
std::atomic<bool> m_continueThreadRunning;
CPluginDomTraverser* m_traverser;
public:
- std::auto_ptr<CPluginFilter> m_filter;
+ CPluginFilter m_filter;
private:
void ThreadProc();
CComAutoCriticalSection m_criticalSectionCache;
std::set<std::wstring> m_cacheFrames;
std::wstring m_cacheDomain;
- void SetDocumentUrl(const std::wstring& url);
void InjectABP(IWebBrowser2* browser);
public:
- CPluginTabBase(CPluginClass* plugin);
+ CPluginTabBase();
~CPluginTabBase();
std::wstring GetDocumentDomain();
+ void SetDocumentUrl(const std::wstring& url);
std::wstring GetDocumentUrl();
virtual void OnActivate();
virtual void OnUpdate();
@@ -75,7 +64,6 @@
void CacheFrame(const std::wstring& url);
bool IsFrameCached(const std::wstring& url);
void ClearFrameCache(const std::wstring& domain=L"");
-
};
/**
@@ -87,7 +75,7 @@
{
public:
- CPluginTab(CPluginClass* plugin) : CPluginTabBase(plugin) {};
+ CPluginTab() : CPluginTabBase() {};
~CPluginTab() {};
};
« no previous file with comments | « src/plugin/PluginDomTraverserBase.h ('k') | src/plugin/PluginTabBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld