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

Delta Between Two Patch Sets: src/plugin/PluginClass.h

Issue 29323561: Issue #3383 - Rewrite and simplify browser-site handling in CPluginClass (Closed)
Left Patch Set: change type of m_webBrowser2 Created Nov. 18, 2015, 6:08 p.m.
Right Patch Set: initialization; shorten comment Created Dec. 3, 2015, 2:23 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | src/plugin/PluginClass.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void STDMETHODCALLTYPE OnDocumentComplete(IDispatch* frameBrowserDisp, VARIANT * /*urlOrPidl*/); 132 void STDMETHODCALLTYPE OnDocumentComplete(IDispatch* frameBrowserDisp, VARIANT * /*urlOrPidl*/);
133 void STDMETHODCALLTYPE OnWindowStateChanged(unsigned long flags, unsigned long validFlagsMask); 133 void STDMETHODCALLTYPE OnWindowStateChanged(unsigned long flags, unsigned long validFlagsMask);
134 void STDMETHODCALLTYPE OnCommandStateChange(long command, VARIANT_BOOL enable) ; 134 void STDMETHODCALLTYPE OnCommandStateChange(long command, VARIANT_BOOL enable) ;
135 void STDMETHODCALLTYPE OnOnQuit(); 135 void STDMETHODCALLTYPE OnOnQuit();
136 void Unadvise(); 136 void Unadvise();
137 137
138 void ShowStatusBar(); 138 void ShowStatusBar();
139 bool IsStatusBarEnabled(); 139 bool IsStatusBarEnabled();
140 140
141 /** 141 /**
142 * Our site object as a browser. 142 * A browser interface pointer to our site object
143 * 143 *
144 * It's values are set and reset solely in SetSite(). 144 * It's values are set and reset solely in SetSite().
sergei 2015/11/30 15:52:09 This part of the comment is not necessary, it's cl
Eric 2015/11/30 16:31:51 I disagree. Nothing about this variable is either
Oleksandr 2015/12/03 11:51:58 I assume we're talking about the part of the comme
Eric 2015/12/03 14:24:54 It's no more defensive, at least ordinarily, than
145 * The declaration as CComPtr is defensive programming;
146 * it ensures that the site keeps this interface alive for us in the
147 * unlikely case that the site is different from a browser.
148 */ 145 */
149 CComPtr<IWebBrowser2> m_webBrowser2; 146 CComPtr<IWebBrowser2> m_webBrowser2;
150 HWND m_hBrowserWnd; 147 HWND m_hBrowserWnd;
151 HWND m_hTabWnd; 148 HWND m_hTabWnd;
152 HWND m_hStatusBarWnd; 149 HWND m_hStatusBarWnd;
153 HWND m_hPaneWnd; 150 HWND m_hPaneWnd;
154 151
155 WNDPROC m_pWndProcStatus; 152 WNDPROC m_pWndProcStatus;
156 int m_nPaneWidth; 153 int m_nPaneWidth;
157 HANDLE m_hTheme; 154 HANDLE m_hTheme;
(...skipping 28 matching lines...) Expand all
186 183
187 // Async browser 184 // Async browser
188 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2; 185 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2;
189 static CComQIPtr<IWebBrowser2> GetAsyncBrowser(); 186 static CComQIPtr<IWebBrowser2> GetAsyncBrowser();
190 }; 187 };
191 188
192 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass) 189 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass)
193 190
194 191
195 #endif // _PLUGIN_CLASS_H_ 192 #endif // _PLUGIN_CLASS_H_
LEFTRIGHT

Powered by Google App Engine
This is Rietveld