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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome_frame/chrome_frame_activex.h

Issue 2359002: Simplify Chrome Frame usage of Chrome identifiers by simply using the Chrome ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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/chrome_frame.gyp ('k') | chrome_frame/chrome_imported_resources.h » ('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) 2010 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>
11 11
(...skipping 22 matching lines...) Expand all
34 public IObjectSafetyImpl<ChromeFrameActivex, 34 public IObjectSafetyImpl<ChromeFrameActivex,
35 INTERFACESAFE_FOR_UNTRUSTED_CALLER | 35 INTERFACESAFE_FOR_UNTRUSTED_CALLER |
36 INTERFACESAFE_FOR_UNTRUSTED_DATA>, 36 INTERFACESAFE_FOR_UNTRUSTED_DATA>,
37 public IObjectWithSiteImpl<ChromeFrameActivex>, 37 public IObjectWithSiteImpl<ChromeFrameActivex>,
38 public IPersistPropertyBag { 38 public IPersistPropertyBag {
39 public: 39 public:
40 typedef ChromeFrameActivexBase<ChromeFrameActivex, CLSID_ChromeFrame> Base; 40 typedef ChromeFrameActivexBase<ChromeFrameActivex, CLSID_ChromeFrame> Base;
41 ChromeFrameActivex(); 41 ChromeFrameActivex();
42 ~ChromeFrameActivex(); 42 ~ChromeFrameActivex();
43 43
44 DECLARE_REGISTRY_RESOURCEID(IDR_CHROMEFRAME) 44 DECLARE_REGISTRY_RESOURCEID(IDR_CHROMEFRAME_ACTIVEX)
45 45
46 BEGIN_COM_MAP(ChromeFrameActivex) 46 BEGIN_COM_MAP(ChromeFrameActivex)
47 COM_INTERFACE_ENTRY(IObjectWithSite) 47 COM_INTERFACE_ENTRY(IObjectWithSite)
48 COM_INTERFACE_ENTRY(IObjectSafety) 48 COM_INTERFACE_ENTRY(IObjectSafety)
49 COM_INTERFACE_ENTRY(IPersistPropertyBag) 49 COM_INTERFACE_ENTRY(IPersistPropertyBag)
50 COM_INTERFACE_ENTRY(IConnectionPointContainer) 50 COM_INTERFACE_ENTRY(IConnectionPointContainer)
51 COM_INTERFACE_ENTRY_CHAIN(Base) 51 COM_INTERFACE_ENTRY_CHAIN(Base)
52 END_COM_MAP() 52 END_COM_MAP()
53 53
54 BEGIN_MSG_MAP(ChromeFrameActivex) 54 BEGIN_MSG_MAP(ChromeFrameActivex)
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 BSTR target); 142 BSTR target);
143 143
144 // Installs a hook on the top-level window hosting the control. 144 // Installs a hook on the top-level window hosting the control.
145 HRESULT InstallTopLevelHook(IOleClientSite* client_site); 145 HRESULT InstallTopLevelHook(IOleClientSite* client_site);
146 146
147 // 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.
148 HHOOK chrome_wndproc_hook_; 148 HHOOK chrome_wndproc_hook_;
149 }; 149 };
150 150
151 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_ 151 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | chrome_frame/chrome_imported_resources.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698