Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(959)

Unified Diff: chrome/browser/ui/views/location_bar/selected_keyword_view.cc

Issue 9837059: Cleanup for views::Label: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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/location_bar/location_bar_view.cc ('k') | ui/views/controls/label.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/location_bar/selected_keyword_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/selected_keyword_view.cc (revision 128075)
+++ chrome/browser/ui/views/location_bar/selected_keyword_view.cc (working copy)
@@ -46,8 +46,8 @@
}
void SelectedKeywordView::Layout() {
- SetLabel((width() == GetPreferredSize().width()) ?
- full_label_.GetText() : partial_label_.GetText());
+ SetLabel(((width() == GetPreferredSize().width()) ?
+ full_label_ : partial_label_).text());
IconLabelBubbleView::Layout();
}
@@ -71,6 +71,6 @@
const std::wstring min_string(
location_bar_util::CalculateMinString(UTF16ToWide(short_name)));
partial_label_.SetText(min_string.empty() ?
- full_label_.GetText() :
+ full_label_.text() :
l10n_util::GetStringFUTF16(message_id, WideToUTF16(min_string)));
}
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | ui/views/controls/label.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698