Fix layout of omnibox rows for material design

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 "components/omnibox/browser/autocomplete_match.h"
@@ skipping 65 matching lines @@
   // class, this is the height of one line of text.
   virtual int GetTextHeight() const;
 
   // Returns the display width required for the match contents.
   int GetMatchContentsWidth() const;
 
   // Stores the image in a local data member and schedules a repaint.
   void SetAnswerImage(const gfx::ImageSkia& image);
 
  protected:
+  enum RenderTextType {
+    CONTENTS = 0,
+    SEPARATOR,
+    DESCRIPTION,
+    NUM_TYPES
+  };
+
   // Paints the given |match| using the RenderText instances |contents| and
   // |description| at offset |x| in the bounds of this view.
   virtual void PaintMatch(const AutocompleteMatch& match,
                           gfx::RenderText* contents,
                           gfx::RenderText* description,
                           gfx::Canvas* canvas,
                           int x) const;
 
   // Draws given |render_text| on |canvas| at given location (|x|, |y|).
-  // |contents| indicates whether the |render_text| is for the match contents
-  // (rather than the separator or the description).  Additional properties from
-  // |match| are used to render Infinite suggestions correctly.  If |max_width|
-  // is a non-negative number, the text will be elided to fit within
-  // |max_width|.  Returns the x position to the right of the string.
+  // |contents| indicates if the |render_text| is for the match contents,
+  // separator, or description.  Additional properties from |match| are used to
+  // render Infinite suggestions correctly.  If |max_width| is a non-negative
+  // number, the text will be elided to fit within |max_width|.  Returns the x
+  // position to the right of the string.
   int DrawRenderText(const AutocompleteMatch& match,
                      gfx::RenderText* render_text,
-                     bool contents,
+                     RenderTextType render_text_type,
                      gfx::Canvas* canvas,
                      int x,
                      int y,
                      int max_width) const;
 
   // Creates a RenderText with given |text| and rendering defaults.
   scoped_ptr<gfx::RenderText> CreateRenderText(
       const base::string16& text) const;
 
   // Creates a RenderText with default rendering for the given |text|. The
@@ skipping 104 matching lines @@
   mutable scoped_ptr<gfx::RenderText> separator_rendertext_;
   mutable scoped_ptr<gfx::RenderText> keyword_contents_rendertext_;
   mutable scoped_ptr<gfx::RenderText> keyword_description_rendertext_;
 
   mutable int separator_width_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxResultView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_RESULT_VIEW_H_