Fix up the Windows omnibox after the recent endcap removal. This fixes most ...

chrome/browser/views/location_bar/location_bar_view.h

 // Copyright (c) 2010 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_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 23 matching lines @@
 class EVBubbleView;
 class ExtensionAction;
 class GURL;
 class KeywordHintView;
 class LocationIconView;
 class PageActionWithBadgeView;
 class Profile;
 class SelectedKeywordView;
 class StarView;
 
+namespace views {
+class HorizontalPainter;
+};
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
 //   The LocationBarView class is a View subclass that paints the background
 //   of the URL bar strip and contains its content.
 //
 /////////////////////////////////////////////////////////////////////////////
 class LocationBarView : public LocationBar,
                         public LocationBarTesting,
@@ skipping 147 matching lines @@
   virtual void PopForceHidden();
   virtual LocationBarTesting* GetLocationBarForTesting() { return this; }
 
   // Overridden from LocationBarTesting:
   virtual int PageActionCount() { return page_action_views_.size(); }
   virtual int PageActionVisibleCount();
   virtual ExtensionAction* GetPageAction(size_t index);
   virtual ExtensionAction* GetVisiblePageAction(size_t index);
   virtual void TestPageActionPressed(size_t index);
 
-  static const int kVertMargin;
+  static const int kVertMargin;     // Space above and below the edit.
+  static const int kEdgeThickness;  // Unavailable space at horizontal edges.
+  static const int kItemPadding;    // Space between items within the bar.
 
  protected:
   void Focus();
 
  private:
   typedef std::vector<ContentSettingImageView*> ContentSettingViews;
 
   friend class PageActionImageView;
   friend class PageActionWithBadgeView;
   typedef std::vector<PageActionWithBadgeView*> PageActionViews;
@@ skipping 68 matching lines @@
 
   // The user's desired disposition for how their input should be opened
   WindowOpenDisposition disposition_;
 
   // The transition type to use for the navigation
   PageTransition::Type transition_;
 
   // Font used by edit and some of the hints.
   gfx::Font font_;
 
+  // An object used to paint the normal-mode background.
+  scoped_ptr<views::HorizontalPainter> 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 wrapper
   views::NativeViewHost* location_entry_view_;
 
   // The following views are used to provide hints and remind the user as to
@@ skipping 24 matching lines @@
   // We should actually be hidden iff this is greater than zero.
   int force_hidden_count_;
 
   // Used schedule a task for the first run info bubble.
   ScopedRunnableMethodFactory<LocationBarView> first_run_bubble_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_