chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm - Issue 6278007: Remove wstring from TemplateURL and friends....

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/cocoa/options/edit_search_engine_cocoa_controller.mm

Issue 6278007: Remove wstring from TemplateURL and friends.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 9 years, 11 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/cocoa/options/edit_search_engine_cocoa_controller.mm

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

--- chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm (revision 71791)

+++ chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm (working copy)

@@ -87,11 +87,11 @@

[window setTitle:l10n_util::GetNSString(

IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE)];

[nameField_ setStringValue:

- base::SysWideToNSString(templateURL_->short_name())];

+ base::SysUTF16ToNSString(templateURL_->short_name())];

[keywordField_ setStringValue:

- base::SysWideToNSString(templateURL_->keyword())];

+ base::SysUTF16ToNSString(templateURL_->keyword())];

[urlField_ setStringValue:

- base::SysWideToNSString(templateURL_->url()->DisplayURL())];

+ base::SysUTF16ToNSString(templateURL_->url()->DisplayURL())];

[urlField_ setEnabled:(templateURL_->prepopulate_id() == 0)];

}

// When creating a new keyword, this will mark the fields as "invalid" and