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

Side by Side Diff: chrome_frame/bho.h

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert bad indentation, rebase 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/service/cloud_print/print_system_win.cc ('k') | chrome_frame/bho.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) 2011 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_BHO_H_ 5 #ifndef CHROME_FRAME_BHO_H_
6 #define CHROME_FRAME_BHO_H_ 6 #define CHROME_FRAME_BHO_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <deletebrowsinghistory.h> 10 #include <deletebrowsinghistory.h>
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // switching can be achieved by canceling original navigation 104 // switching can be achieved by canceling original navigation
105 // and issuing a new one using IWebBrowser2->Navigate2. 105 // and issuing a new one using IWebBrowser2->Navigate2.
106 static HRESULT STDMETHODCALLTYPE OnHttpEquiv( 106 static HRESULT STDMETHODCALLTYPE OnHttpEquiv(
107 IBrowserService_OnHttpEquiv_Fn original_httpequiv, 107 IBrowserService_OnHttpEquiv_Fn original_httpequiv,
108 IBrowserService* browser, IShellView* shell_view, BOOL done, 108 IBrowserService* browser, IShellView* shell_view, BOOL done,
109 VARIANT* in_arg, VARIANT* out_arg); 109 VARIANT* in_arg, VARIANT* out_arg);
110 110
111 static void ProcessOptInUrls(IWebBrowser2* browser, BSTR url); 111 static void ProcessOptInUrls(IWebBrowser2* browser, BSTR url);
112 112
113 // COM_INTERFACE_ENTRY_CACHED_TEAR_OFF manages the raw pointer from CComPtr 113 // COM_INTERFACE_ENTRY_CACHED_TEAR_OFF manages the raw pointer from CComPtr
114 // which ScopedComPtr doesn't expose. 114 // which base::win::ScopedComPtr doesn't expose.
115 CComPtr<IUnknown> delete_chrome_history_; 115 CComPtr<IUnknown> delete_chrome_history_;
116 116
117 protected: 117 protected:
118 bool PatchProtocolHandler(const CLSID& handler_clsid); 118 bool PatchProtocolHandler(const CLSID& handler_clsid);
119 119
120 static _ATL_FUNC_INFO kBeforeNavigate2Info; 120 static _ATL_FUNC_INFO kBeforeNavigate2Info;
121 static _ATL_FUNC_INFO kNavigateComplete2Info; 121 static _ATL_FUNC_INFO kNavigateComplete2Info;
122 static _ATL_FUNC_INFO kDocumentCompleteInfo; 122 static _ATL_FUNC_INFO kDocumentCompleteInfo;
123 }; 123 };
124 124
125 #endif // CHROME_FRAME_BHO_H_ 125 #endif // CHROME_FRAME_BHO_H_
OLDNEW
« no previous file with comments | « chrome/service/cloud_print/print_system_win.cc ('k') | chrome_frame/bho.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698