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

Unified Diff: content/renderer/media/webmediaplayer_impl.h

Issue 170783010: Encrypted Media: Handle blink::WebString in WebMediaPlayer*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 6 years, 10 months 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
Index: content/renderer/media/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index aca7ec2d3bbff633eb39aa89eff550836caca2ef..7808852e0de77ddf7c17ed6b2e5d85f58fe04a71 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -244,18 +244,18 @@ class WebMediaPlayerImpl
// Actually do the work for generateKeyRequest/addKey so they can easily
// report results to UMA.
MediaKeyException GenerateKeyRequestInternal(
- const blink::WebString& key_system,
+ const std::string& key_system,
const unsigned char* init_data,
unsigned init_data_length);
- MediaKeyException AddKeyInternal(const blink::WebString& key_system,
+ MediaKeyException AddKeyInternal(const std::string& key_system,
const unsigned char* key,
unsigned key_length,
const unsigned char* init_data,
unsigned init_data_length,
- const blink::WebString& session_id);
+ const std::string& session_id);
MediaKeyException CancelKeyRequestInternal(
- const blink::WebString& key_system,
- const blink::WebString& session_id);
+ const std::string& key_system,
+ const std::string& session_id);
// Gets the duration value reported by the pipeline.
double GetPipelineDuration() const;
@@ -292,7 +292,7 @@ class WebMediaPlayerImpl
// The currently selected key system. Empty string means that no key system
// has been selected.
- blink::WebString current_key_system_;
+ std::string current_key_system_;
// The LoadType passed in the |load_type| parameter of the load() call.
LoadType load_type_;
« no previous file with comments | « content/renderer/media/crypto/key_systems_unittest.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698