Delta Between Two Patch Sets: src/plugin/PluginClass.h
Issue 29334397:
Issue #2230, #3391 - Load filters on "download begin" event
Left Patch Set:
Created Jan. 22, 2016, 6:02 p.m.
Right Patch Set: address comments
Created Feb. 3, 2016, 6:04 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« src/plugin/DetachedInitialization.h ('k')
|
src/plugin/PluginClass.cpp » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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-2016 Eyeo GmbH | 3 * Copyright (C) 2006-2016 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 42 class CPluginMimeFilterClient; | 42 class CPluginMimeFilterClient; |
| 43 | 43 |
| 44 | 44 |
| 45 class ATL_NO_VTABLE CPluginClass : | 45 class ATL_NO_VTABLE CPluginClass : |
| 46 public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>, | 46 public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>, |
| 47 public ATL::CComCoClass<CPluginClass, &CLSID_PluginClass>, | 47 public ATL::CComCoClass<CPluginClass, &CLSID_PluginClass>, |
| 48 public ATL::IObjectWithSiteImpl<CPluginClass>, | 48 public ATL::IObjectWithSiteImpl<CPluginClass>, |
| 49 public IOleCommandTarget, | 49 public IOleCommandTarget, |
| 50 public ATL::IDispEventImpl<1, CPluginClass, &DIID_DWebBrowserEvents2, &LIBID_S HDocVw, 1, 1> | 50 public ATL::IDispEventImpl<1, CPluginClass, &DIID_DWebBrowserEvents2, &LIBID_S HDocVw, 1, 1> |
| 51 { | 51 { |
| 52 | |
| 53 // friend class CPluginTab; | |
|
sergei
2016/01/29 10:03:20
It can be removed
Eric
2016/02/03 18:03:20
Done.
| |
| 54 | 52 |
| 55 private: | 53 private: |
| 56 | 54 |
| 57 CPluginTab* m_tab; | 55 CPluginTab* m_tab; |
| 58 | 56 |
| 59 public: | 57 public: |
| 60 | 58 |
| 61 DECLARE_REGISTRY_RESOURCEID(IDR_PLUGIN_CLASS) | 59 DECLARE_REGISTRY_RESOURCEID(IDR_PLUGIN_CLASS) |
| 62 | 60 |
| 63 DECLARE_PROTECT_FINAL_CONSTRUCT() | 61 DECLARE_PROTECT_FINAL_CONSTRUCT() |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 185 | 183 |
| 186 // Async browser | 184 // Async browser |
| 187 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2; | 185 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2; |
| 188 static CComQIPtr<IWebBrowser2> GetAsyncBrowser(); | 186 static CComQIPtr<IWebBrowser2> GetAsyncBrowser(); |
| 189 }; | 187 }; |
| 190 | 188 |
| 191 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass) | 189 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass) |
| 192 | 190 |
| 193 | 191 |
| 194 #endif // _PLUGIN_CLASS_H_ | 192 #endif // _PLUGIN_CLASS_H_ |
| LEFT | RIGHT |
« src/plugin/DetachedInitialization.h ('k')
|
src/plugin/PluginClass.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
