summaryrefslogtreecommitdiffstats
path: root/chrome_frame/com_message_event.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/com_message_event.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/com_message_event.h')
-rw-r--r--chrome_frame/com_message_event.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/com_message_event.h b/chrome_frame/com_message_event.h
index 86fec2d..39900e9 100644
--- a/chrome_frame/com_message_event.h
+++ b/chrome_frame/com_message_event.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
@@ -8,8 +8,9 @@
#include <atlbase.h>
#include <atlcom.h>
#include <mshtml.h> // IHTMLEventObj
+
#include "base/basictypes.h"
-#include "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
// Implements a MessageEvent compliant event object by providing MessageEvent
// specific properties itself and inherited properties from a browser provided
@@ -63,7 +64,7 @@ END_COM_MAP()
// calls that we do not directly support. This may not be initialized
// if our container does not require the properties/methods exposed by
// the basic event object.
- ScopedComPtr<IHTMLEventObj> basic_event_;
+ base::win::ScopedComPtr<IHTMLEventObj> basic_event_;
std::string message_;
std::string origin_;
std::string type_;