chrome/browser/ui/views/location_bar/location_bar_view.cc - Issue 7552026: Convert ToolbarModel::GetEVCertName() from wstring to 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/ui/views/location_bar/location_bar_view.cc

Issue 7552026: Convert ToolbarModel::GetEVCertName() from wstring to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 4 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:

Index: chrome/browser/ui/views/location_bar/location_bar_view.cc

diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc

index b9af06fbd076afd4829949e332448cb96ff1a236..f15d5c904c0153a4b6206957a29fa8afeb717425 100644

--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc

+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -491,7 +491,7 @@ void LocationBarView::Layout() {

entry_width -= (kEdgeThickness + kEdgeEditPadding);

} else if (model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {

ev_bubble_view_->SetVisible(true);

- ev_bubble_view_->SetLabel(model_->GetEVCertName());

+ ev_bubble_view_->SetLabel(UTF16ToWideHack(model_->GetEVCertName()));

ev_bubble_width = ev_bubble_view_->GetPreferredSize().width();

// We'll adjust this width and take it out of |entry_width| below.

} else {

« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_model.cc ('k') | no next file » | no next file with comments »