From fcf75d4016c7a2dcad1d2415009eff1e0eef4468 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Tue, 3 Dec 2013 20:11:26 +0000 Subject: 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 --- content/public/browser/content_browser_client.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '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 f105cc9..b404a97 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 >& 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 >& render_views) { return true; -- cgit v1.1