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

Unified Diff: content/worker/websharedworker_stub.cc

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/worker/websharedworker_stub.h ('k') | google_apis/gaia/oauth2_mint_token_flow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/worker/websharedworker_stub.cc
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc
index 2a551f32e05439437e6d33f1fb195288fa45c5bd..d77db2585d1ee6c763c9d1f662e02f53b092a0b8 100644
--- a/content/worker/websharedworker_stub.cc
+++ b/content/worker/websharedworker_stub.cc
@@ -19,7 +19,7 @@
namespace content {
WebSharedWorkerStub::WebSharedWorkerStub(
- const string16& name,
+ const base::string16& name,
int route_id,
const WorkerAppCacheInitInfo& appcache_init_info)
: route_id_(route_id),
@@ -81,8 +81,9 @@ const GURL& WebSharedWorkerStub::url() {
}
void WebSharedWorkerStub::OnStartWorkerContext(
- const GURL& url, const string16& user_agent, const string16& source_code,
- const string16& content_security_policy,
+ const GURL& url, const base::string16& user_agent,
+ const base::string16& source_code,
+ const base::string16& content_security_policy,
blink::WebContentSecurityPolicyType policy_type) {
// Ignore multiple attempts to start this worker (can happen if two pages
// try to start it simultaneously).
« no previous file with comments | « content/worker/websharedworker_stub.h ('k') | google_apis/gaia/oauth2_mint_token_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698