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

Unified Diff: chrome_frame/utils.cc

Issue 5507001: base: Remove stub scoped_variant_win.h file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month 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/ui_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/utils.cc
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 8fd90fc4a48fcd0bf88b823b85fff68ff2ba3702..e4279a707105f5abddfc03f9a69128452deabf2f 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -41,7 +41,6 @@
using base::win::RegKey;
using base::win::ScopedComPtr;
-using base::win::ScopedVariant;
// Note that these values are all lower case and are compared to
// lower-case-transformed values.
@@ -825,7 +824,7 @@ HRESULT NavigateBrowserToMoniker(IUnknown* browser, IMoniker* moniker,
ScopedComPtr<IUriContainer> uri_container;
hr = uri_container.QueryFrom(moniker);
- ScopedVariant headers_var;
+ base::win::ScopedVariant headers_var;
if (headers && headers[0])
headers_var.Set(headers);
@@ -880,7 +879,7 @@ HRESULT NavigateBrowserToMoniker(IUnknown* browser, IMoniker* moniker,
fragment = NULL;
}
- ScopedVariant var_url(UTF8ToWide(target_url.spec()).c_str());
+ base::win::ScopedVariant var_url(UTF8ToWide(target_url.spec()).c_str());
hr = browser_priv->NavigateWithBindCtx(var_url.AsInput(), NULL, NULL,
NULL, headers_var.AsInput(),
bind_ctx,
« no previous file with comments | « chrome_frame/test/ui_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698