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 6756044: Remove extension automation support that was used only by CEEE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head. Created 9 years, 8 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/cfproxy_test.cc ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 90
91 protected: 91 protected:
92 // ChromeFrameDelegate overrides 92 // ChromeFrameDelegate overrides
93 virtual void OnLoad(const GURL& url); 93 virtual void OnLoad(const GURL& url);
94 virtual void OnMessageFromChromeFrame(const std::string& message, 94 virtual void OnMessageFromChromeFrame(const std::string& message,
95 const std::string& origin, 95 const std::string& origin,
96 const std::string& target); 96 const std::string& target);
97 virtual void OnLoadFailed(int error_code, const std::string& url); 97 virtual void OnLoadFailed(int error_code, const std::string& url);
98 virtual void OnAutomationServerLaunchFailed( 98 virtual void OnAutomationServerLaunchFailed(
99 AutomationLaunchResult reason, const std::string& server_version); 99 AutomationLaunchResult reason, const std::string& server_version);
100 virtual void OnExtensionInstalled(const FilePath& path,
101 void* user_data, AutomationMsg_ExtensionResponseValues response);
102 virtual void OnGetEnabledExtensionsComplete(
103 void* user_data,
104 const std::vector<FilePath>& extension_directories);
105 virtual void OnChannelError(); 100 virtual void OnChannelError();
106 101
107 // Separated to static function for unit testing this logic more easily. 102 // Separated to static function for unit testing this logic more easily.
108 static bool ShouldShowVersionMismatchDialog(bool is_privileged, 103 static bool ShouldShowVersionMismatchDialog(bool is_privileged,
109 IOleClientSite* client_site); 104 IOleClientSite* client_site);
110 105
111 private: 106 private:
112 LRESULT OnCreate(UINT message, WPARAM wparam, LPARAM lparam, 107 LRESULT OnCreate(UINT message, WPARAM wparam, LPARAM lparam,
113 BOOL& handled); // NO_LINT 108 BOOL& handled); // NO_LINT
114 LRESULT OnHostMoved(UINT message, WPARAM wparam, LPARAM lparam, 109 LRESULT OnHostMoved(UINT message, WPARAM wparam, LPARAM lparam,
(...skipping 27 matching lines...) Expand all
142 BSTR target); 137 BSTR target);
143 138
144 // Installs a hook on the top-level window hosting the control. 139 // Installs a hook on the top-level window hosting the control.
145 HRESULT InstallTopLevelHook(IOleClientSite* client_site); 140 HRESULT InstallTopLevelHook(IOleClientSite* client_site);
146 141
147 // A hook attached to the top-level window containing the ActiveX control. 142 // A hook attached to the top-level window containing the ActiveX control.
148 HHOOK chrome_wndproc_hook_; 143 HHOOK chrome_wndproc_hook_;
149 }; 144 };
150 145
151 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_ 146 #endif // CHROME_FRAME_CHROME_FRAME_ACTIVEX_H_
OLDNEW
« no previous file with comments | « chrome_frame/cfproxy_test.cc ('k') | chrome_frame/chrome_frame_activex.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698