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

Unified Diff: content/browser/worker_host/worker_process_host.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
Index: content/browser/worker_host/worker_process_host.cc
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 08277da2a4c7393f601c49ccd01a3bd766f0ca25..fae589bf476b74950aeca84763a50aa3b9b0d34e 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -372,8 +372,8 @@ void WorkerProcessHost::OnWorkerContextClosed(int worker_route_id) {
void WorkerProcessHost::OnAllowDatabase(int worker_route_id,
const GURL& url,
- const string16& name,
- const string16& display_name,
+ const base::string16& name,
+ const base::string16& display_name,
unsigned long estimated_size,
bool* result) {
*result = GetContentClient()->browser()->AllowWorkerDatabase(
@@ -390,7 +390,7 @@ void WorkerProcessHost::OnAllowFileSystem(int worker_route_id,
void WorkerProcessHost::OnAllowIndexedDB(int worker_route_id,
const GURL& url,
- const string16& name,
+ const base::string16& name,
bool* result) {
*result = GetContentClient()->browser()->AllowWorkerIndexedDB(
url, name, resource_context_, GetRenderViewIDsForWorker(worker_route_id));
@@ -572,7 +572,7 @@ net::URLRequestContext* WorkerProcessHost::GetRequestContext(
WorkerProcessHost::WorkerInstance::WorkerInstance(
const GURL& url,
- const string16& name,
+ const base::string16& name,
int worker_route_id,
int parent_process_id,
int64 main_resource_appcache_id,
@@ -593,7 +593,7 @@ WorkerProcessHost::WorkerInstance::WorkerInstance(
WorkerProcessHost::WorkerInstance::WorkerInstance(
const GURL& url,
bool shared,
- const string16& name,
+ const base::string16& name,
ResourceContext* resource_context,
const WorkerStoragePartition& partition)
: url_(url),
@@ -618,7 +618,7 @@ WorkerProcessHost::WorkerInstance::~WorkerInstance() {
// b) the names are both empty, and the urls are equal
bool WorkerProcessHost::WorkerInstance::Matches(
const GURL& match_url,
- const string16& match_name,
+ const base::string16& match_name,
const WorkerStoragePartition& partition,
ResourceContext* resource_context) const {
// Only match open shared workers.
« no previous file with comments | « content/browser/worker_host/worker_process_host.h ('k') | content/browser/worker_host/worker_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698