summaryrefslogtreecommitdiffstats
path: root/chrome_frame/bind_status_callback_impl.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 20:53:23 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-12 20:53:23 +0000
commit8ee65baac4ab9e3beb67674adbc6a210e2708604 (patch)
tree44400d118d7813a8d7e16a67f074c6696f8868b3 /chrome_frame/bind_status_callback_impl.h
parentf1094b0275c82ead4b9aabbda24f5c2b3e8b4a1b (diff)
downloadchromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.zip
chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.gz
chromium_src-8ee65baac4ab9e3beb67674adbc6a210e2708604.tar.bz2
Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.
Fix up all the callers to use the new location and namespace. Also, delete the stub file since it isn't included by anyone more. (Note: This was a TODO for brettw). BUG=None TEST=None R=brettw@chromium.org Review URL: http://codereview.chromium.org/6825055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/bind_status_callback_impl.h')
-rw-r--r--chrome_frame/bind_status_callback_impl.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/bind_status_callback_impl.h b/chrome_frame/bind_status_callback_impl.h
index 7066050..57245e4 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);