chrome/browser/content_settings/content_settings_usages_state.cc - Issue 105193002: Replace string16 with base::string16.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/content_settings/content_settings_usages_state.cc

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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/content_settings/content_settings_browsertest.cc ('k') | chrome/browser/content_settings/tab_specific_content_settings.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/content_settings/content_settings_usages_state.h"	5 #include "chrome/browser/content_settings/content_settings_usages_state.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "base/prefs/pref_service.h"	9 #include "base/prefs/pref_service.h"

10 #include "base/strings/string_piece.h"	10 #include "base/strings/string_piece.h"

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 *tab_state_flags \|= TABSTATE_HAS_EXCEPTION;	94 *tab_state_flags \|= TABSTATE_HAS_EXCEPTION;

95 if (saved_setting != i->second)	95 if (saved_setting != i->second)

96 *tab_state_flags \|= TABSTATE_HAS_CHANGED;	96 *tab_state_flags \|= TABSTATE_HAS_CHANGED;

97 if (saved_setting != CONTENT_SETTING_ASK)	97 if (saved_setting != CONTENT_SETTING_ASK)

98 *tab_state_flags \|= TABSTATE_HAS_ANY_ICON;	98 *tab_state_flags \|= TABSTATE_HAS_ANY_ICON;

99 }	99 }

100 }	100 }

101	101

102 std::string ContentSettingsUsagesState::GURLToFormattedHost(	102 std::string ContentSettingsUsagesState::GURLToFormattedHost(

103 const GURL& url) const {	103 const GURL& url) const {

104 string16 display_host;	104 base::string16 display_host;

105 net::AppendFormattedHost(url,	105 net::AppendFormattedHost(url,

106 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), &display_host);	106 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages), &display_host);

107 return UTF16ToUTF8(display_host);	107 return UTF16ToUTF8(display_host);

108 }	108 }

OLD	NEW