Restyle omnibox popup

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;
+class OmniboxViewDelegate;
 
 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,
-                    views::View* location_bar,
+                    OmniboxViewDelegate* view_delegate,
                     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);
 
   void Invalidate();
 
   // views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   ResultViewState GetState() const;
 
+  // Returns the height of the text portion of the result view. In the base
+  // class, this is the height of one line of text.
+  virtual int GetTextHeight() const;
+
  protected:
   virtual void PaintMatch(gfx::Canvas* canvas,
                           const AutocompleteMatch& match,
                           int x);
 
-  // Returns the height of the text portion of the result view. In the base
-  // class, this is the height of one line of text.
-  virtual int GetTextHeight() const;
-
   // Draws the specified |text| into the canvas, using highlighting provided by
   // |classifications|. If |force_dim| is true, ACMatchClassification::DIM is
   // added to all of the classifications. Returns the x position to the right
   // of the string.
   int DrawString(gfx::Canvas* canvas,
                  const string16& text,
                  const ACMatchClassifications& classifications,
                  bool force_dim,
                  int x,
                  int y);
@@ skipping 50 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_;
 
-  views::View* location_bar_;
+  OmniboxViewDelegate* view_delegate_;
 
   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_