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

Side by Side Diff: ceee/ie/plugin/toolband/tool_band.h

Issue 6063001: ceee: Include base/win/scope_comptr.h instead of base/scoped_comptr_win.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/ceee
Patch Set: fix chrome_frame Created 10 years 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 | « ceee/ie/plugin/bho/http_negotiate.cc ('k') | ceee/ie/plugin/toolband/tool_band.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) 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 // IE toolband implementation. 5 // IE toolband implementation.
6 #ifndef CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_ 6 #ifndef CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_
7 #define CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_ 7 #define CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_
8 8
9 #include <atlbase.h> 9 #include <atlbase.h>
10 #include <atlapp.h> // Must be included AFTER base. 10 #include <atlapp.h> // Must be included AFTER base.
11 #include <atlcom.h> 11 #include <atlcom.h>
12 #include <atlcrack.h> 12 #include <atlcrack.h>
13 #include <atlgdi.h> 13 #include <atlgdi.h>
14 #include <atlwin.h> 14 #include <atlwin.h>
15 #include <atlmisc.h> 15 #include <atlmisc.h>
16 #include <exdispid.h> 16 #include <exdispid.h>
17 #include <shobjidl.h> 17 #include <shobjidl.h>
18 #include <list> 18 #include <list>
19 #include <string> 19 #include <string>
20 20
21 #include "base/basictypes.h" 21 #include "base/basictypes.h"
22 #include "base/scoped_comptr_win.h"
23 #include "base/scoped_ptr.h" 22 #include "base/scoped_ptr.h"
23 #include "base/win/scoped_comptr.h"
24 #include "base/win/rgs_helper.h" 24 #include "base/win/rgs_helper.h"
25 #include "ceee/ie/plugin/toolband/resource.h" 25 #include "ceee/ie/plugin/toolband/resource.h"
26 26
27 #include "chrome_tab.h" // NOLINT 27 #include "chrome_tab.h" // NOLINT
28 #include "toolband.h" // NOLINT 28 #include "toolband.h" // NOLINT
29 29
30 class DictionaryValue; 30 class DictionaryValue;
31 class PageApi; 31 class PageApi;
32 class ToolBand; 32 class ToolBand;
33 class DictionaryValue; 33 class DictionaryValue;
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 // The OwnLine flag indicates that the toolband should request from the IE 218 // The OwnLine flag indicates that the toolband should request from the IE
219 // host to put it in its own space (and not behind whatever toolband might 219 // host to put it in its own space (and not behind whatever toolband might
220 // have been installed first). 220 // have been installed first).
221 bool ShouldForceOwnLine(); 221 bool ShouldForceOwnLine();
222 void ClearForceOwnLineFlag(); 222 void ClearForceOwnLineFlag();
223 223
224 // A test seam for BHO instantiation test. 224 // A test seam for BHO instantiation test.
225 virtual HRESULT CreateBhoInstance(IObjectWithSite** new_bho_instance); 225 virtual HRESULT CreateBhoInstance(IObjectWithSite** new_bho_instance);
226 226
227 // The web browser that initialized this toolband. 227 // The web browser that initialized this toolband.
228 ScopedComPtr<IWebBrowser2> web_browser_; 228 base::win::ScopedComPtr<IWebBrowser2> web_browser_;
229 // Our parent window, yielded by our site's IOleWindow. 229 // Our parent window, yielded by our site's IOleWindow.
230 CWindow parent_window_; 230 CWindow parent_window_;
231 // Our band id, provided by GetBandInfo. 231 // Our band id, provided by GetBandInfo.
232 DWORD band_id_; 232 DWORD band_id_;
233 233
234 // The minimum size the toolband should take. 234 // The minimum size the toolband should take.
235 LONG current_width_; 235 LONG current_width_;
236 LONG current_height_; 236 LONG current_height_;
237 237
238 // The URL to our extension. 238 // The URL to our extension.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 static _ATL_FUNC_INFO handler_type_long_; 272 static _ATL_FUNC_INFO handler_type_long_;
273 static _ATL_FUNC_INFO handler_type_idispatch_bstr_; 273 static _ATL_FUNC_INFO handler_type_idispatch_bstr_;
274 static _ATL_FUNC_INFO handler_type_bstr_i4_; 274 static _ATL_FUNC_INFO handler_type_bstr_i4_;
275 static _ATL_FUNC_INFO handler_type_bstrarray_; 275 static _ATL_FUNC_INFO handler_type_bstrarray_;
276 static _ATL_FUNC_INFO handler_type_idispatch_variantref_; 276 static _ATL_FUNC_INFO handler_type_idispatch_variantref_;
277 277
278 DISALLOW_COPY_AND_ASSIGN(ToolBand); 278 DISALLOW_COPY_AND_ASSIGN(ToolBand);
279 }; 279 };
280 280
281 #endif // CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_ 281 #endif // CEEE_IE_PLUGIN_TOOLBAND_TOOL_BAND_H_
OLDNEW
« no previous file with comments | « ceee/ie/plugin/bho/http_negotiate.cc ('k') | ceee/ie/plugin/toolband/tool_band.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698