Restyle omnibox popup

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

Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h
index 1689f6950976aabad469d905795011d283f393a8..a241bb44baaae299da42c39fdb15af0d40b725db 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h
@@ -19,10 +19,11 @@ struct AutocompleteMatch;
 class OmniboxEditModel;
 class OmniboxResultView;
 class OmniboxView;
+class OmniboxViewDelegate;
 class Profile;
 
 namespace views {
-class BubbleBorder;
+class ImageView;
 }
 
 // A view representing the contents of the autocomplete popup.
@@ -35,7 +36,7 @@ class OmniboxPopupContentsView : public views::View,
   static OmniboxPopupView* Create(const gfx::Font& font,
                                   OmniboxView* omnibox_view,
                                   OmniboxEditModel* edit_model,
-                                  views::View* location_bar);
+                                  OmniboxViewDelegate* view_delegate);
 
   // Returns the bounds the popup should be shown at. This is the display bounds
   // and includes offsets for the dropshadow which this view's border renders.
@@ -80,10 +81,10 @@ class OmniboxPopupContentsView : public views::View,
   OmniboxPopupContentsView(const gfx::Font& font,
                            OmniboxView* omnibox_view,
                            OmniboxEditModel* edit_model,
-                           views::View* location_bar);
+                           OmniboxViewDelegate* view_delegate);
   virtual ~OmniboxPopupContentsView();
 
-  views::View* location_bar() { return location_bar_; }
+  OmniboxViewDelegate* view_delegate() { return view_delegate_; }
 
   virtual void PaintResultViews(gfx::Canvas* canvas);
 
@@ -119,12 +120,6 @@ class OmniboxPopupContentsView : public views::View,
   // bounds the path.
   void MakeContentsPath(gfx::Path* path, const gfx::Rect& bounding_rect);
 
-  // Updates the window's blur region for the current size.
-  void UpdateBlurRegion();
-
-  // Makes the contents of the canvas slightly transparent.
-  void MakeCanvasTransparent(gfx::Canvas* canvas);
-
   // Called when the line at the specified index should be opened with the
   // provided disposition.
   void OpenIndex(size_t index, WindowOpenDisposition disposition);
@@ -158,11 +153,7 @@ class OmniboxPopupContentsView : public views::View,
   // The edit view that invokes us.
   OmniboxView* omnibox_view_;
 
-  // 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_;
+  OmniboxViewDelegate* view_delegate_;
 
   // The font used for result rows, based on the omnibox font.
   gfx::Font font_;
@@ -181,6 +172,15 @@ class OmniboxPopupContentsView : public views::View,
   gfx::Rect start_bounds_;
   gfx::Rect target_bounds_;
 
+  scoped_ptr<views::ImageView> provider_logo_;
+  int left_margin_;
+  int right_margin_;
+
+  const gfx::ImageSkia* bottom_shadow_;  // Ptr owned by resource bundle.
+
+  // Amount of extra padding to add to the popup on the top and bottom.
+  int outside_vertical_padding_;
+
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupContentsView);
 };