diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:44:57 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 21:44:57 +0000 |
| commit | c9d8113703584a262972858475a560c78733a7dd (patch) | |
| tree | 89fdd28a63032b7c1277c2fcd39f111a2522db91 /chrome/renderer | |
| parent | 40e93e58ffd857435bfd509772a621efea1e8746 (diff) | |
| download | chromium_src-c9d8113703584a262972858475a560c78733a7dd.zip chromium_src-c9d8113703584a262972858475a560c78733a7dd.tar.gz chromium_src-c9d8113703584a262972858475a560c78733a7dd.tar.bz2 | |
Convert WebPluginInfo from wstring to string16
BUG=None
TEST=No behavioral change; plugins should continue to work.
Review URL: http://codereview.chromium.org/2866014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index ab21bbe9..8b4068c 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -342,8 +342,8 @@ bool WebPluginDelegateProxy::Initialize(const GURL& url, // expensive extra copy for us). if (!transparent_ && mime_type_ == "application/x-shockwave-flash") { bool force_opaque_mode = false; - if (StartsWith(info_.version, L"10.0", false) || - StartsWith(info_.version, L"9.", false)) { + if (StartsWith(info_.version, ASCIIToUTF16("10.0"), false) || + StartsWith(info_.version, ASCIIToUTF16("9."), false)) { // Older versions of Flash don't support CA (and they assume QuickDraw // support, so we can't rely on negotiation to do the right thing). force_opaque_mode = true; @@ -1542,7 +1542,7 @@ bool WebPluginDelegateProxy::UseSynchronousGeometryUpdates() { // Need to update geometry synchronously with WMP, otherwise if a site // scripts the plugin to start playing while it's in the middle of handling // an update geometry message, videos don't play. See urls in bug 20260. - if (info_.name.find(L"Windows Media Player") != std::wstring::npos) + if (info_.name.find(ASCIIToUTF16("Windows Media Player")) != string16::npos) return true; // The move networks plugin needs to be informed of geometry updates |