chrome/browser/ui/views/location_bar/selected_keyword_view.cc - Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link

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/ui/views/location_bar/selected_keyword_view.cc

Issue 8142026: Revert 104076 - Change std::wstring to string16 for views::Link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/login_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/ui/views/location_bar/selected_keyword_view.h"	5 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"

6	6

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/utf_string_conversions.h"

9 #include "chrome/browser/search_engines/template_url_service.h"	9 #include "chrome/browser/search_engines/template_url_service.h"

10 #include "chrome/browser/search_engines/template_url_service_factory.h"	10 #include "chrome/browser/search_engines/template_url_service_factory.h"

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 TemplateURLService* model =	59 TemplateURLService* model =

60 TemplateURLServiceFactory::GetForProfile(profile_);	60 TemplateURLServiceFactory::GetForProfile(profile_);

61 if (!model)	61 if (!model)

62 return;	62 return;

63	63

64 bool is_extension_keyword;	64 bool is_extension_keyword;

65 const string16 short_name = model->GetKeywordShortName(keyword,	65 const string16 short_name = model->GetKeywordShortName(keyword,

66 &is_extension_keyword);	66 &is_extension_keyword);

67 int message_id = is_extension_keyword ?	67 int message_id = is_extension_keyword ?

68 IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;	68 IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;

69 full_label_.SetText(	69 full_label_.SetText(UTF16ToWide(

70 l10n_util::GetStringFUTF16(message_id, short_name));	70 l10n_util::GetStringFUTF16(message_id, short_name)));

71 const std::wstring min_string(	71 const std::wstring min_string(

72 location_bar_util::CalculateMinString(UTF16ToWide(short_name)));	72 location_bar_util::CalculateMinString(UTF16ToWide(short_name)));

73 partial_label_.SetText(min_string.empty() ?	73 partial_label_.SetText(min_string.empty() ?

74 full_label_.GetText() :	74 full_label_.GetText() :

75 l10n_util::GetStringFUTF16(message_id, WideToUTF16(min_string)));	75 UTF16ToWide(l10n_util::GetStringFUTF16(message_id,

	76 WideToUTF16(min_string))));

76 }	77 }

OLD	NEW