From 965722ff0e981ac0775648460be766c829a10a2b Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Wed, 20 Oct 2010 15:50:30 +0000 Subject: Remove scoped_bstr_win, fix all callers to use the new location. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3748012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63216 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_frame_activex.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome_frame/chrome_frame_activex.cc') diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index ad405d3..0d7d256 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -380,7 +380,7 @@ STDMETHODIMP ChromeFrameActivex::put_src(BSTR src) { if (document_url.SchemeIsSecure()) { GURL source_url(src); if (!source_url.SchemeIsSecure()) { - Base::put_src(ScopedBstr(g_activex_insecure_content_error)); + Base::put_src(base::win::ScopedBstr(g_activex_insecure_content_error)); return E_ACCESSDENIED; } } @@ -408,7 +408,7 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite( ScopedComPtr document; GetContainingDocument(document.Receive()); if (document) { - ScopedBstr url; + base::win::ScopedBstr url; if (SUCCEEDED(document->get_URL(url.Receive()))) WideToUTF8(url, url.Length(), &document_url_); } @@ -440,7 +440,7 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite( chrome_extra_arguments.assign(extra_arguments_arg, extra_arguments_arg.Length()); - ScopedBstr automated_functions_arg; + base::win::ScopedBstr automated_functions_arg; service_hr = service->GetExtensionApisToAutomate( automated_functions_arg.Receive()); if (S_OK == service_hr && automated_functions_arg) { @@ -666,6 +666,6 @@ HRESULT ChromeFrameActivex::registerBhoIfNeeded() { } web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string), - ScopedVariant(bho)); + base::win::ScopedVariant(bho)); return S_OK; } -- cgit v1.1