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

Unified Diff: src/plugin/PluginClass.h

Issue 29323561: Issue #3383 - Rewrite and simplify browser-site handling in CPluginClass (Closed)
Patch Set: Created Aug. 13, 2015, 4:52 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 | « no previous file | src/plugin/PluginClass.cpp » ('j') | src/plugin/PluginClass.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/plugin/PluginClass.h
===================================================================
--- a/src/plugin/PluginClass.h
+++ b/src/plugin/PluginClass.h
@@ -79,15 +79,10 @@
CPluginClass();
~CPluginClass();
- HRESULT FinalConstruct();
- void FinalRelease();
-
// IObjectWithSite
-
STDMETHOD(SetSite)(IUnknown *pUnkSite);
// IOleCommandTarget
-
STDMETHOD(QueryStatus)(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[], OLECMDTEXT* pCmdText);
STDMETHOD(Exec)(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG* pvaOut);
@@ -96,7 +91,6 @@
CPluginTab* GetTab();
void UpdateStatusBar();
- static DWORD WINAPI MainThreadProc(LPVOID pParam);
private:
@@ -108,9 +102,7 @@
public:
HWND GetBrowserHWND() const;
- HWND GetTabHWND() const;
- CComQIPtr<IWebBrowser2> GetBrowser() const;
-
+ bool IsRootPageBrowser(IWebBrowser2*);
static CPluginMimeFilterClient* s_mimeFilter;
@@ -146,9 +138,7 @@
void ShowStatusBar();
bool IsStatusBarEnabled();
-public:
- CComQIPtr<IWebBrowser2> m_webBrowser2;
-private:
+ IWebBrowser2* m_webBrowser2;
sergei 2015/10/01 16:15:51 I really don't understand the reluctance to use sm
Oleksandr 2015/10/05 10:44:47 +1.
Eric 2015/11/18 13:57:31 My rule: Use them when you need them and don't use
HWND m_hBrowserWnd;
HWND m_hTabWnd;
HWND m_hStatusBarWnd;
@@ -180,14 +170,10 @@
static HANDLE s_hMainThread;
static bool s_isMainThreadDone;
- static HANDLE GetMainThreadHandle();
- static bool IsMainThreadDone(HANDLE mainThread);
-
static HINSTANCE s_hUxtheme;
static std::set<CPluginClass*> s_instances;
static std::map<DWORD,CPluginClass*> s_threadInstances;
static CComAutoCriticalSection s_criticalSectionLocal;
- static CComAutoCriticalSection s_criticalSectionBrowser;
static CComAutoCriticalSection s_criticalSectionWindow;
// Async browser
« no previous file with comments | « no previous file | src/plugin/PluginClass.cpp » ('j') | src/plugin/PluginClass.cpp » ('J')

Powered by Google App Engine
This is Rietveld