summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_activex.h
diff options
context:
space:
mode:
authormad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:14:40 +0000
committermad@chromium.org <mad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-26 20:14:40 +0000
commitefd4dfc2ed1aeab923b14db6ad2a9d11781ddab9 (patch)
tree5255c711b087d6a261d247d16e07ca23c6c62651 /chrome_frame/chrome_frame_activex.h
parent71cbdf4801cec5193cec3fe813ad5d20009bd042 (diff)
downloadchromium_src-efd4dfc2ed1aeab923b14db6ad2a9d11781ddab9.zip
chromium_src-efd4dfc2ed1aeab923b14db6ad2a9d11781ddab9.tar.gz
chromium_src-efd4dfc2ed1aeab923b14db6ad2a9d11781ddab9.tar.bz2
Added the propagation of the OnChannelError notification.
So that automation tests can tell when the communication between Chrome and Chrome Frame was cut. BUG=none TEST=none Review URL: http://codereview.chromium.org/1237003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex.h')
-rw-r--r--chrome_frame/chrome_frame_activex.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h
index 8ebab2b..dec399e 100644
--- a/chrome_frame/chrome_frame_activex.h
+++ b/chrome_frame/chrome_frame_activex.h
@@ -11,6 +11,7 @@
#include <set>
#include <string>
+#include <vector>
#include "base/scoped_bstr_win.h"
#include "base/scoped_comptr_win.h"
@@ -56,7 +57,7 @@ END_MSG_MAP()
HRESULT FinalConstruct();
- virtual HRESULT OnDraw(ATL_DRAWINFO& draw_info);
+ virtual HRESULT OnDraw(ATL_DRAWINFO& draw_info); // NOLINT
// IPersistPropertyBag implementation
STDMETHOD(GetClassID)(CLSID* class_id) {
@@ -97,6 +98,7 @@ END_MSG_MAP()
virtual void OnGetEnabledExtensionsComplete(
void* user_data,
const std::vector<FilePath>& extension_directories);
+ virtual void OnChannelError();
private:
LRESULT OnCreate(UINT message, WPARAM wparam, LPARAM lparam,