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

Unified Diff: content/public/browser/content_browser_client.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/public/browser/content_browser_client.h ('k') | content/public/browser/download_save_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/content_browser_client.cc
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index f105cc9a692fea5ff755541caa59639cb5cfb22c..b404a974e2ec2be6f5f8eab091522d0c66c04f12 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -141,8 +141,8 @@ bool ContentBrowserClient::AllowSaveLocalState(ResourceContext* context) {
bool ContentBrowserClient::AllowWorkerDatabase(
const GURL& url,
- const string16& name,
- const string16& display_name,
+ const base::string16& name,
+ const base::string16& display_name,
unsigned long estimated_size,
ResourceContext* context,
const std::vector<std::pair<int, int> >& render_views) {
@@ -158,7 +158,7 @@ bool ContentBrowserClient::AllowWorkerFileSystem(
bool ContentBrowserClient::AllowWorkerIndexedDB(
const GURL& url,
- const string16& name,
+ const base::string16& name,
ResourceContext* context,
const std::vector<std::pair<int, int> >& render_views) {
return true;
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/public/browser/download_save_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698