| Index: chrome/browser/ui/views/location_bar/location_bar_view.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/location_bar/location_bar_view.h (revision 203497)
|
| +++ chrome/browser/ui/views/location_bar/location_bar_view.h (working copy)
|
| @@ -324,12 +324,10 @@
|
| // edges.
|
| static int GetItemPadding();
|
|
|
| - // Thickness of the left and right edges of the omnibox, in normal mode.
|
| - static const int kNormalHorizontalEdgeThickness;
|
| + // Thickness of the edges of the omnibox background images, in normal mode.
|
| + static const int kNormalEdgeThickness;
|
| // 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.
|
| @@ -350,7 +348,7 @@
|
|
|
| // The same, but for the top and bottom edges.
|
| int vertical_edge_thickness() const {
|
| - return is_popup_mode_ ? kPopupEdgeThickness : kNormalVerticalEdgeThickness;
|
| + return is_popup_mode_ ? kPopupEdgeThickness : kNormalEdgeThickness;
|
| }
|
|
|
| // Update the visibility state of the Content Blocked icons to reflect what is
|
| @@ -423,7 +421,8 @@
|
| content::PageTransition transition_;
|
|
|
| // An object used to paint the normal-mode background.
|
| - scoped_ptr<views::Painter> background_painter_;
|
| + scoped_ptr<views::Painter> background_border_painter_;
|
| + scoped_ptr<views::Painter> background_filling_painter_;
|
|
|
| // An icon to the left of the edit field.
|
| LocationIconView* location_icon_view_;
|
|
|