Side by Side Diff: src/plugin/PluginClass.h
Issue 29319002:
Issue 1737 - ABP 1.3 for IE sometimes blocks navigation to the ad from Google search results
Patch Set:
Created June 22, 2015, 3 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
src/plugin/PluginClass.cpp » ('j')
|
src/plugin/PluginWbPassThrough.cpp » ('J')
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')
| OLD | NEW |
|---|---|
| 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 86 | 86 |
| 87 STDMETHOD(SetSite)(IUnknown *pUnkSite); | 87 STDMETHOD(SetSite)(IUnknown *pUnkSite); |
| 88 | 88 |
| 89 // IOleCommandTarget | 89 // IOleCommandTarget |
| 90 | 90 |
| 91 STDMETHOD(QueryStatus)(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT* pCmdText); | 91 STDMETHOD(QueryStatus)(const GUID* pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT* pCmdText); |
| 92 STDMETHOD(Exec)(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG* pva Out); | 92 STDMETHOD(Exec)(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG* pva Out); |
| 93 | 93 |
| 94 | 94 |
| 95 static CPluginTab* GetTab(DWORD dwThreadId); | 95 static CPluginTab* GetTab(DWORD dwThreadId); |
| 96 static bool HasTabs(); | |
| 96 CPluginTab* GetTab(); | 97 CPluginTab* GetTab(); |
| 97 | 98 |
| 98 void UpdateStatusBar(); | 99 void UpdateStatusBar(); |
| 99 static DWORD WINAPI MainThreadProc(LPVOID pParam); | 100 static DWORD WINAPI MainThreadProc(LPVOID pParam); |
| 100 | 101 |
| 101 private: | 102 private: |
| 102 | 103 |
| 103 bool SetMenuBar(HMENU hMenu, const std::wstring& url); | 104 bool SetMenuBar(HMENU hMenu, const std::wstring& url); |
| 104 HMENU CreatePluginMenu(const std::wstring& url); | 105 HMENU CreatePluginMenu(const std::wstring& url); |
| 105 | 106 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 | 193 |
| 193 // Async browser | 194 // Async browser |
| 194 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2; | 195 static CComQIPtr<IWebBrowser2> s_asyncWebBrowser2; |
| 195 static CComQIPtr<IWebBrowser2> GetAsyncBrowser(); | 196 static CComQIPtr<IWebBrowser2> GetAsyncBrowser(); |
| 196 }; | 197 }; |
| 197 | 198 |
| 198 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass) | 199 OBJECT_ENTRY_AUTO(__uuidof(PluginClass), CPluginClass) |
| 199 | 200 |
| 200 | 201 |
| 201 #endif // _PLUGIN_CLASS_H_ | 202 #endif // _PLUGIN_CLASS_H_ |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
src/plugin/PluginClass.cpp » ('j')
|
src/plugin/PluginWbPassThrough.cpp » ('J')
