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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

Issue 11535014: Replace StyleRange with BreakList; update RenderText, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 7 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
Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
index d1d7b9bfcab0521b9fef4d482963ef93d16b4638..a846397a13b5ab28413ce3baf0c6d133cc0e289d 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc
@@ -89,8 +89,7 @@ OmniboxPopupContentsView::OmniboxPopupContentsView(
omnibox_view_(omnibox_view),
profile_(edit_model->profile()),
location_bar_(location_bar),
- result_font_(font.DeriveFont(kEditFontAdjust)),
- result_bold_font_(result_font_.DeriveFont(0, gfx::Font::BOLD)),
+ font_(font.DeriveFont(kEditFontAdjust)),
ignore_mouse_drag_(false),
ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) {
// The following little dance is required because set_border() requires a
@@ -109,8 +108,7 @@ void OmniboxPopupContentsView::Init() {
// necessarily our final class yet, and we may have subclasses
// overriding CreateResultView.
for (size_t i = 0; i < AutocompleteResult::kMaxMatches; ++i) {
- OmniboxResultView* result_view =
- CreateResultView(this, i, result_font_, result_bold_font_);
+ OmniboxResultView* result_view = CreateResultView(this, i, font_);
result_view->SetVisible(false);
AddChildViewAt(result_view, static_cast<int>(i));
}
@@ -393,9 +391,8 @@ int OmniboxPopupContentsView::CalculatePopupHeight() {
OmniboxResultView* OmniboxPopupContentsView::CreateResultView(
OmniboxResultViewModel* model,
int model_index,
- const gfx::Font& font,
- const gfx::Font& bold_font) {
- return new OmniboxResultView(model, model_index, font, bold_font);
+ const gfx::Font& font) {
+ return new OmniboxResultView(model, model_index, font);
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h ('k') | chrome/browser/ui/views/omnibox/omnibox_result_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698