chrome/browser/ui/cocoa/keyword_editor_cocoa_controller_unittest.mm - Issue 6322001: 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/keyword_editor_cocoa_controller_unittest.mm

Issue 6322001: 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:

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

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/keyword_editor_cocoa_controller_unittest.mm

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

--- chrome/browser/ui/cocoa/keyword_editor_cocoa_controller_unittest.mm (revision 71269)

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

@@ -1,9 +1,10 @@

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

// found in the LICENSE file.

#include "base/mac/scoped_nsautorelease_pool.h"

#include "base/scoped_nsobject.h"

+#include "base/utf_string_conversions.h"

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_model.h"

#include "chrome/browser/ui/browser.h"

@@ -151,16 +152,16 @@

// Add a default engine.

TemplateURL* t_url = new TemplateURL();

t_url->SetURL("http://test1/{searchTerms}", 0, 0);

- t_url->set_keyword(L"test1");

- t_url->set_short_name(L"Test1");

+ t_url->set_keyword(ASCIIToUTF16("test1"));

+ t_url->set_short_name(ASCIIToUTF16("Test1"));

t_url->set_show_in_default_list(true);

template_model->Add(t_url);

// Add a non-default engine.

t_url = new TemplateURL();

t_url->SetURL("http://test2/{searchTerms}", 0, 0);

- t_url->set_keyword(L"test2");

- t_url->set_short_name(L"Test2");

+ t_url->set_keyword(ASCIIToUTF16("test2"));

+ t_url->set_short_name(ASCIIToUTF16("Test2"));

t_url->set_show_in_default_list(false);

template_model->Add(t_url);

@@ -194,15 +195,15 @@

// Add 2 default engines.

TemplateURL* t_url = new TemplateURL();

t_url->SetURL("http://test1/{searchTerms}", 0, 0);

- t_url->set_keyword(L"test1");

- t_url->set_short_name(L"Test1");

+ t_url->set_keyword(ASCIIToUTF16("test1"));

+ t_url->set_short_name(ASCIIToUTF16("Test1"));

t_url->set_show_in_default_list(true);

template_model->Add(t_url);

t_url = new TemplateURL();

t_url->SetURL("http://test2/{searchTerms}", 0, 0);

- t_url->set_keyword(L"test2");

- t_url->set_short_name(L"Test2");

+ t_url->set_keyword(ASCIIToUTF16("test2"));

+ t_url->set_short_name(ASCIIToUTF16("Test2"));

t_url->set_show_in_default_list(true);

template_model->Add(t_url);