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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_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
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.cc (revision 128075)
+++ chrome/browser/ui/views/location_bar/location_bar_view.cc (working copy)
@@ -475,7 +475,7 @@
suggested_text_view_->SetFont(GetOmniboxViewWin()->GetFont());
#endif
AddChildView(suggested_text_view_);
- } else if (suggested_text_view_->GetText() != text) {
+ } else if (suggested_text_view_->text() != text) {
suggested_text_view_->SetText(text);
}
if (animate_to_complete && !location_entry_->IsImeComposing())
@@ -492,7 +492,7 @@
}
string16 LocationBarView::GetInstantSuggestion() const {
- return HasValidSuggestText() ? suggested_text_view_->GetText() : string16();
+ return HasValidSuggestText() ? suggested_text_view_->text() : string16();
}
#endif
@@ -1300,7 +1300,7 @@
#if defined(OS_WIN) || defined(USE_AURA)
bool LocationBarView::HasValidSuggestText() const {
return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
- !suggested_text_view_->GetText().empty();
+ !suggested_text_view_->text().empty();
}
#if !defined(USE_AURA)
« no previous file with comments | « chrome/browser/ui/views/generic_info_view_unittest.cc ('k') | chrome/browser/ui/views/location_bar/selected_keyword_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698