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

Unified Diff: content/browser/media/media_internals.h

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « content/browser/media/media_browsertest.cc ('k') | content/browser/media/media_internals.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/media_internals.h
diff --git a/content/browser/media/media_internals.h b/content/browser/media/media_internals.h
index 8a179e0197b90b14abfc0d9a688d0c4e9b524df0..c0f144a5b8b4a080df5aea55ca7b320ac7362caf 100644
--- a/content/browser/media/media_internals.h
+++ b/content/browser/media/media_internals.h
@@ -37,7 +37,7 @@ class CONTENT_EXPORT MediaInternals
const std::vector<media::MediaLogEvent>& events);
// Called with the update string.
- typedef base::Callback<void(const string16&)> UpdateCallback;
+ typedef base::Callback<void(const base::string16&)> UpdateCallback;
// Add/remove update callbacks (see above). Must be called on the IO thread.
void AddUpdateCallback(const UpdateCallback& callback);
@@ -59,7 +59,7 @@ class CONTENT_EXPORT MediaInternals
// Sends |update| to each registered UpdateCallback. Safe to call from any
// thread, but will forward to the IO thread.
- void SendUpdate(const string16& update);
+ void SendUpdate(const base::string16& update);
// Caches |value| under |cache_key| so that future SendEverything() calls will
// include the current data. Calls JavaScript |function|(|value|) for each
« no previous file with comments | « content/browser/media/media_browsertest.cc ('k') | content/browser/media/media_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698