Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Side by Side Diff: chrome_frame/chrome_frame_activex.h

Issue 1831001: Fixes to address code review comments from tommi from CL http://codereview.ch... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/CFInstall.js ('k') | chrome_frame/chrome_frame_activex.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_ 5 #ifndef CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_
6 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_ 6 #define CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <atlctl.h> 10 #include <atlctl.h>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 return E_NOTIMPL; 78 return E_NOTIMPL;
79 } 79 }
80 80
81 // Used to setup the document_url_ member needed for completing navigation. 81 // Used to setup the document_url_ member needed for completing navigation.
82 // Create external tab (possibly in incognito mode). 82 // Create external tab (possibly in incognito mode).
83 HRESULT IOleObject_SetClientSite(IOleClientSite* client_site); 83 HRESULT IOleObject_SetClientSite(IOleClientSite* client_site);
84 84
85 // Overridden to perform security checks. 85 // Overridden to perform security checks.
86 STDMETHOD(put_src)(BSTR src); 86 STDMETHOD(put_src)(BSTR src);
87 87
88 // IObjectWithSite
89 STDMETHOD(SetSite)(IUnknown* site);
90
91 // IChromeFrame 88 // IChromeFrame
92 // On a fresh install of ChromeFrame the BHO will not be loaded in existing 89 // On a fresh install of ChromeFrame the BHO will not be loaded in existing
93 // IE tabs/windows. This function instantiates the BHO and registers it 90 // IE tabs/windows. This function instantiates the BHO and registers it
94 // explicitly. 91 // explicitly.
95 STDMETHOD(RegisterBHOIfNeeded)(); 92 STDMETHOD(registerBhoIfNeeded)();
96 93
97 protected: 94 protected:
98 // ChromeFrameDelegate overrides 95 // ChromeFrameDelegate overrides
99 virtual void OnLoad(int tab_handle, const GURL& url); 96 virtual void OnLoad(int tab_handle, const GURL& url);
100 virtual void OnMessageFromChromeFrame(int tab_handle, 97 virtual void OnMessageFromChromeFrame(int tab_handle,
101 const std::string& message, 98 const std::string& message,
102 const std::string& origin, 99 const std::string& origin,
103 const std::string& target); 100 const std::string& target);
104 virtual void OnLoadFailed(int error_code, const std::string& url); 101 virtual void OnLoadFailed(int error_code, const std::string& url);
105 virtual void OnAutomationServerLaunchFailed( 102 virtual void OnAutomationServerLaunchFailed(
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 139
143 // This variant is used for the privatemessage handler only. 140 // This variant is used for the privatemessage handler only.
144 void FireEvent(const EventHandlers& handlers, IDispatch* event, 141 void FireEvent(const EventHandlers& handlers, IDispatch* event,
145 BSTR target); 142 BSTR target);
146 143
147 // Installs a hook on the top-level window hosting the control. 144 // Installs a hook on the top-level window hosting the control.
148 HRESULT InstallTopLevelHook(IOleClientSite* client_site); 145 HRESULT InstallTopLevelHook(IOleClientSite* client_site);
149 146
150 // A hook attached to the top-level window containing the ActiveX control. 147 // A hook attached to the top-level window containing the ActiveX control.
151 HHOOK chrome_wndproc_hook_; 148 HHOOK chrome_wndproc_hook_;
152
153 ScopedComPtr<IUnknown> site_;
154 }; 149 };
155 150
156 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_ 151 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_
OLDNEW
« no previous file with comments | « chrome_frame/CFInstall.js ('k') | chrome_frame/chrome_frame_activex.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698