Replace StyleRange with BreakList; update RenderText, etc.

chrome/browser/ui/views/omnibox/omnibox_result_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_RESULT_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_
 
+#include <vector>
+
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 
 class OmniboxResultViewModel;
 
 namespace gfx {
 class Canvas;
+class RenderText;
 }
 
 class OmniboxResultView : public views::View,
                           private ui::AnimationDelegate {
  public:
   // Keep these ordered from least dominant (normal) to most dominant
   // (selected).
   enum ResultViewState {
     NORMAL = 0,
     HOVERED,
     SELECTED,
     NUM_STATES
   };
 
   enum ColorKind {
     BACKGROUND = 0,
     TEXT,
     DIMMED_TEXT,
     URL,
     DIVIDER,
     NUM_KINDS
   };
 
   OmniboxResultView(OmniboxResultViewModel* model,
                     int model_index,
-                    const gfx::Font& font,
-                    const gfx::Font& bold_font);
+                    const gfx::Font& font);
   virtual ~OmniboxResultView();
 
   SkColor GetColor(ResultViewState state, ColorKind kind) const;
 
   // Updates the match used to paint the contents of this result view. We copy
   // the match so that we can continue to paint the last result even after the
   // model has changed.
   void SetMatch(const AutocompleteMatch& match);
 
   void ShowKeyword(bool show_keyword);
@@ skipping 27 matching lines @@
 
   const gfx::Rect& text_bounds() const { return text_bounds_; }
 
   void set_edge_item_padding(int value) { edge_item_padding_ = value; }
   void set_item_padding(int value) { item_padding_ = value; }
   void set_minimum_text_vertical_padding(int value) {
     minimum_text_vertical_padding_ = value;
   }
 
  private:
-  struct ClassificationData;
-  typedef std::vector<ClassificationData> Classifications;
-
   struct RunData;
   typedef std::vector<RunData> Runs;
+  typedef std::vector<gfx::RenderText*> Classifications;
 
   // Common initialization code of the colors returned by GetColors().
   static void CommonInitColors(const ui::NativeTheme* theme,
                                SkColor colors[][NUM_KINDS]);
 
   // Predicate functions for use when sorting the runs.
   static bool SortRunsLogically(const RunData& lhs, const RunData& rhs);
   static bool SortRunsVisually(const RunData& lhs, const RunData& rhs);
 
   gfx::ImageSkia GetIcon() const;
@@ skipping 27 matching lines @@
 
   // Default values cached here, may be overridden using the setters above.
   int edge_item_padding_;
   int item_padding_;
   int minimum_text_vertical_padding_;
 
   // This row's model and model index.
   OmniboxResultViewModel* model_;
   size_t model_index_;
 
-  const gfx::Font normal_font_;
-  const gfx::Font bold_font_;
+  const gfx::Font font_;
+  int font_height_;
 
   // Width of the ellipsis in the normal font.
   int ellipsis_width_;
 
   // A context used for mirroring regions.
   class MirroringContext;
   scoped_ptr<MirroringContext> mirroring_context_;
 
   AutocompleteMatch match_;
 
   gfx::Rect text_bounds_;
   gfx::Rect icon_bounds_;
 
   gfx::Rect keyword_text_bounds_;
   scoped_ptr<views::ImageView> keyword_icon_;
 
   scoped_ptr<ui::SlideAnimation> animation_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_