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

Unified Diff: chrome_frame/bind_status_callback_impl.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/bind_context_info.cc ('k') | chrome_frame/bind_status_callback_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/bind_status_callback_impl.h
diff --git a/chrome_frame/bind_status_callback_impl.h b/chrome_frame/bind_status_callback_impl.h
index 7066050f554f78e24fd6930a993ea694d0b172fd..57245e4718cc27b795b1a28a546cca65819a2dac 100644
--- a/chrome_frame/bind_status_callback_impl.h
+++ b/chrome_frame/bind_status_callback_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,7 +10,7 @@
#include <string>
#include <urlmon.h>
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
#include "chrome_frame/utils.h"
// A generic base class for IBindStatus callback implementation.
@@ -88,8 +88,8 @@ END_COM_MAP()
// used for logging.
std::string me();
- ScopedComPtr<IBindStatusCallback> delegate_;
- ScopedComPtr<IBindCtx> bind_ctx_;
+ base::win::ScopedComPtr<IBindStatusCallback> delegate_;
+ base::win::ScopedComPtr<IBindCtx> bind_ctx_;
private:
DISALLOW_COPY_AND_ASSIGN(BSCBImpl);
« no previous file with comments | « chrome_frame/bind_context_info.cc ('k') | chrome_frame/bind_status_callback_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698