chrome/browser/chrome_content_browser_client.h - Issue 105193002: Replace string16 with base::string16.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 105193002: Replace string16 with base::string16. (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:

Index: chrome/browser/chrome_content_browser_client.h

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

index 3d596cb495654f33ff22b0f150a3681ffbbb91cc..cd468d979720a1f087ce9651dda20be6e3b7a7c9 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -134,8 +134,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

virtual bool AllowSaveLocalState(content::ResourceContext* context) OVERRIDE;

virtual bool AllowWorkerDatabase(

const GURL& url,

- const string16& name,

- const string16& display_name,

+ const base::string16& name,

+ const base::string16& display_name,

unsigned long estimated_size,

content::ResourceContext* context,

const std::vector<std::pair<int, int> >& render_views) OVERRIDE;

@@ -145,7 +145,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

const std::vector<std::pair<int, int> >& render_views) OVERRIDE;

virtual bool AllowWorkerIndexedDB(

const GURL& url,

- const string16& name,

+ const base::string16& name,

content::ResourceContext* context,

const std::vector<std::pair<int, int> >& render_views) OVERRIDE;

virtual net::URLRequestContext* OverrideRequestContextForURL(