Revert "Increase omnibox size by 2 px. Increase nominal font size in omnibox to 16 px."

chrome/browser/ui/views/location_bar/location_bar_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_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 306 matching lines @@
   // Returns the height of the control without the top and bottom
   // edges(i.e.  the height of the edit control inside).  If
   // |use_preferred_size| is true this will be the preferred height,
   // otherwise it will be the current height.
   int GetInternalHeight(bool use_preferred_size);
 
   // Space between items in the location bar, as well as between items and the
   // edges.
   static int GetItemPadding();
 
-  // Thickness of the edges of the omnibox background images, in normal mode.
-  static const int kNormalEdgeThickness;
+  // Thickness of the left and right edges of the omnibox, in normal mode.
+  static const int kNormalHorizontalEdgeThickness;
   // The same, but for popup mode.
   static const int kPopupEdgeThickness;
+  // Thickness of the top and bottom edges of the omnibox.
+  static const int kNormalVerticalEdgeThickness;
   // Amount of padding built into the standard omnibox icons.
   static const int kIconInternalPadding;
   // Space between the edge and a bubble.
   static const int kBubblePadding;
 
  protected:
   virtual void OnFocus() OVERRIDE;
 
  private:
   typedef std::vector<ContentSettingImageView*> ContentSettingViews;
 
   friend class PageActionImageView;
   friend class PageActionWithBadgeView;
   typedef std::vector<PageActionWithBadgeView*> PageActionViews;
 
   // Returns the thickness of any visible left and right edge, in pixels.
   int GetHorizontalEdgeThickness() const;
 
   // The same, but for the top and bottom edges.
   int vertical_edge_thickness() const {
-    return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness;
+    return is_popup_mode_ ? kPopupEdgeThickness : kNormalVerticalEdgeThickness;
   }
 
   // Update the visibility state of the Content Blocked icons to reflect what is
   // actually blocked on the current page.
   void RefreshContentSettingViews();
 
   // Delete all page action views that we have created.
   void DeletePageActionViews();
 
   // Update the views for the Page Actions, to reflect state changes for
@@ skipping 52 matching lines @@
   // entered or selected.
   string16 location_input_;
 
   // The user's desired disposition for how their input should be opened
   WindowOpenDisposition disposition_;
 
   // The transition type to use for the navigation
   content::PageTransition transition_;
 
   // An object used to paint the normal-mode background.
-  scoped_ptr<views::Painter> background_border_painter_;
-  scoped_ptr<views::Painter> background_filling_painter_;
+  scoped_ptr<views::Painter> background_painter_;
 
   // An icon to the left of the edit field.
   LocationIconView* location_icon_view_;
 
   // A bubble displayed for EV HTTPS sites.
   EVBubbleView* ev_bubble_view_;
 
   // Location_entry view
   views::View* location_entry_view_;
 
@@ skipping 69 matching lines @@
   // in the right location.
   int animation_offset_;
 
   // Used to register for notifications received by NotificationObserver.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_