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

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/bookmarks/bookmark_bubble_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

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

--- chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc (revision 104083)

+++ chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc (working copy)

@@ -190,8 +190,8 @@

initialized = true;

}

- remove_link_ = new views::Link(l10n_util::GetStringUTF16(

- IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK));

+ remove_link_ = new views::Link(UTF16ToWide(l10n_util::GetStringUTF16(

+ IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK)));

remove_link_->set_listener(this);

edit_button_ = new views::NativeTextButton(

@@ -203,17 +203,18 @@

close_button_->SetIsDefault(true);

views::Label* combobox_label = new views::Label(

- l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_FOLDER_TEXT));

+ UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_FOLDER_TEXT)));

parent_combobox_ = new views::Combobox(&parent_model_);

parent_combobox_->SetSelectedItem(parent_model_.node_parent_index());

parent_combobox_->set_listener(this);

- parent_combobox_->SetAccessibleName(combobox_label->GetText());

+ parent_combobox_->SetAccessibleName(

+ WideToUTF16Hack(combobox_label->GetText()));

views::Label* title_label = new views::Label(

- l10n_util::GetStringUTF16(

+ UTF16ToWide(l10n_util::GetStringUTF16(

newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED :

- IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK));

+ IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK)));

title_label->SetFont(

ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));

title_label->SetColor(kTitleColor);

@@ -256,8 +257,8 @@

layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);

layout->StartRow(0, 2);

- layout->AddView(new views::Label(

- l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_TITLE_TEXT)));

+ layout->AddView(new views::Label(UTF16ToWide(

+ l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_TITLE_TEXT))));

title_tf_ = new views::Textfield();

title_tf_->SetText(GetTitle());

layout->AddView(title_tf_);

Property changes on: chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc

___________________________________________________________________

Deleted: svn:mergeinfo