diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
| commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
| tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/worker/websharedworker_stub.cc | |
| parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
| download | chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2 | |
Convert string16 to base::string16 in content.
BUG=
Review URL: https://codereview.chromium.org/102593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker/websharedworker_stub.cc')
| -rw-r--r-- | content/worker/websharedworker_stub.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc index 2a551f3..d77db25 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). |