chrome/browser/geolocation/geolocation_settings_state.cc - Issue 6898026: Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_...

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/geolocation/geolocation_settings_state.cc

Issue 6898026: Eliminate wstring from base/utf_offset_string_conversions.h, net/base/escape.h, and net/base/net_... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 months 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/extensions/extension_service.cc ('k') | chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm » ('j') | net/base/net_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_settings_state.cc

===================================================================

--- chrome/browser/geolocation/geolocation_settings_state.cc (revision 82762)

+++ chrome/browser/geolocation/geolocation_settings_state.cc (working copy)

@@ -1,4 +1,4 @@

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

// found in the LICENSE file.

@@ -95,9 +95,9 @@

std::string GeolocationSettingsState::GURLToFormattedHost(

const GURL& url) const {

- std::wstring display_host_wide;

- net::AppendFormattedHost(

- url, UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)),

- &display_host_wide, NULL, NULL);

- return WideToUTF8(display_host_wide);

+ string16 display_host;

+ net::AppendFormattedHost(url,

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

+ NULL, NULL);

+ return UTF16ToUTF8(display_host);

}