chrome/browser/content_settings/tab_specific_content_settings.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/content_settings/tab_specific_content_settings.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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_usages_state.cc ('k') | chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/tab_specific_content_settings.h

diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h

index 8671e53b7be0772ec8118ced4182269424f59396..1a4cd58e8e1097f19cdc3ac8e114f12c14e93c86 100644

--- a/chrome/browser/content_settings/tab_specific_content_settings.h

+++ b/chrome/browser/content_settings/tab_specific_content_settings.h

@@ -118,8 +118,8 @@ class TabSpecificContentSettings

static void WebDatabaseAccessed(int render_process_id,

int render_view_id,

const GURL& url,

- const string16& name,

- const string16& display_name,

+ const base::string16& name,

+ const base::string16& display_name,

bool blocked_by_policy);

// Called when a specific DOM storage area in the current page was

@@ -139,7 +139,7 @@ class TabSpecificContentSettings

static void IndexedDBAccessed(int render_process_id,

int render_view_id,

const GURL& url,

- const string16& description,

+ const base::string16& description,

bool blocked_by_policy);

// Called when a specific file system in the current page was accessed.

@@ -312,14 +312,14 @@ class TabSpecificContentSettings

void OnFileSystemAccessed(const GURL& url,

bool blocked_by_policy);

void OnIndexedDBAccessed(const GURL& url,

- const string16& description,

+ const base::string16& description,

bool blocked_by_policy);

void OnLocalStorageAccessed(const GURL& url,

bool local,

bool blocked_by_policy);

void OnWebDatabaseAccessed(const GURL& url,

- const string16& name,

- const string16& display_name,

+ const base::string16& name,

+ const base::string16& display_name,

bool blocked_by_policy);

void OnGeolocationPermissionSet(const GURL& requesting_frame,

bool allowed);