Replace StyleRange with BreakList; update RenderText, etc.

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h"
@@ skipping 67 matching lines @@
   OmniboxPopupContentsView(const gfx::Font& font,
                            OmniboxView* omnibox_view,
                            OmniboxEditModel* edit_model,
                            views::View* location_bar);
   virtual ~OmniboxPopupContentsView();
 
   virtual void PaintResultViews(gfx::Canvas* canvas);
 
   // Calculates the height needed to show all the results in the model.
   virtual int CalculatePopupHeight();
-  virtual OmniboxResultView* CreateResultView(
-      OmniboxResultViewModel* model,
-      int model_index,
-      const gfx::Font& font,
-      const gfx::Font& bold_font);
+  virtual OmniboxResultView* CreateResultView(OmniboxResultViewModel* model,
+                                              int model_index,
+                                              const gfx::Font& font);
 
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   // This method should not be triggered directly as we paint our children
   // in an un-conventional way inside OnPaint. We use a separate canvas to
   // paint the children. Hence we override this method to a no-op so that
   // the view hierarchy does not "accidentally" trigger this.
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
 
   scoped_ptr<OmniboxPopupModel> model_;
@@ skipping 54 matching lines @@
   OmniboxView* omnibox_view_;
 
   Profile* profile_;
 
   // An object that the popup positions itself against.
   views::View* location_bar_;
 
   // Our border, which can compute our desired bounds.
   const views::BubbleBorder* bubble_border_;
 
-  // The font that we should use for result rows. This is based on the font used
-  // by the edit that created us.
-  gfx::Font result_font_;
-
-  // The font used for portions that match the input.
-  gfx::Font result_bold_font_;
+  // The font used for result rows, based on the omnibox font.
+  gfx::Font font_;
 
   // If the user cancels a dragging action (i.e. by pressing ESC), we don't have
   // a convenient way to release mouse capture. Instead we use this flag to
   // simply ignore all remaining drag events, and the eventual mouse release
   // event. Since OnDragCanceled() can be called when we're not dragging, this
   // flag is reset to false on a mouse pressed event, to make sure we don't
   // erroneously ignore the next drag.
   bool ignore_mouse_drag_;
 
   // The popup sizes vertically using an animation when the popup is getting
   // shorter (not larger, that makes it look "slow").
   ui::SlideAnimation size_animation_;
   gfx::Rect start_bounds_;
   gfx::Rect target_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_POPUP_CONTENTS_VIEW_H_