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

Unified Diff: chrome_frame/test/ie_event_sink.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/com_message_event_unittest.cc ('k') | chrome_frame/test/ie_event_sink.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/ie_event_sink.h
diff --git a/chrome_frame/test/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h
index 41672a7bcbf3f8ab300f8e0819ec3b5f72081952..1346e1c3db85076ae9b144e6ca6636b144d83a33 100644
--- a/chrome_frame/test/ie_event_sink.h
+++ b/chrome_frame/test/ie_event_sink.h
@@ -10,10 +10,10 @@
#include <exdispid.h>
#include <string>
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
-#include "chrome_frame/test_utils.h"
#include "chrome_frame/test/simulate_input.h"
+#include "chrome_frame/test_utils.h"
// Include without path to make GYP build see it.
#include "chrome_tab.h" // NOLINT
@@ -233,8 +233,8 @@ END_SINK_MAP()
HRESULT OnLoadError(const VARIANT* param);
HRESULT OnMessage(const VARIANT* param);
- ScopedComPtr<IWebBrowser2> web_browser2_;
- ScopedComPtr<IChromeFrame> chrome_frame_;
+ base::win::ScopedComPtr<IWebBrowser2> web_browser2_;
+ base::win::ScopedComPtr<IChromeFrame> chrome_frame_;
DispCallback<IEEventSink> onmessage_;
DispCallback<IEEventSink> onloaderror_;
DispCallback<IEEventSink> onload_;
« no previous file with comments | « chrome_frame/test/com_message_event_unittest.cc ('k') | chrome_frame/test/ie_event_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698