Fix various issues with popup/app window layout/drawing.

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 <stddef.h>
 
 #include <string>
@@ skipping 110 matching lines @@
   static const char kViewClassName[];
 
   LocationBarView(Browser* browser,
                   Profile* profile,
                   CommandUpdater* command_updater,
                   Delegate* delegate,
                   bool is_popup_mode);
 
   ~LocationBarView() override;
 
+  // Returns the color for the location bar border in MD windows and non-MD
+  // popup windows, given the window's |incognito| state.
+  static SkColor GetBorderColor(bool incognito);
+
   // Initializes the LocationBarView.
   void Init();
 
   // True if this instance has been initialized by calling Init, which can only
   // be called when the receiving instance is attached to a view container.
   bool IsInitialized() const;
 
   // Returns the appropriate color for the desired kind, based on the user's
   // system theme.
   SkColor GetColor(ColorKind kind) const;
@@ skipping 68 matching lines @@
 
   LocationIconView* location_icon_view() { return location_icon_view_; }
 
   // Return the point suitable for anchoring location-bar-anchored bubbles at.
   // The point will be returned in the coordinates of the LocationBarView.
   gfx::Point GetLocationBarAnchorPoint() const;
 
   OmniboxViewViews* omnibox_view() { return omnibox_view_; }
   const OmniboxViewViews* omnibox_view() const { return omnibox_view_; }
 
-  // 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);
-
   // Returns the position and width that the popup should be, and also the left
   // edge that the results should align themselves to (which will leave some
   // border on the left of the popup). |top_edge_overlap| specifies the number
   // of pixels the top edge of the popup should overlap the bottom edge of
   // the toolbar.
   void GetOmniboxPopupPositioningInfo(gfx::Point* top_left_screen_coord,
                                       int* popup_width,
                                       int* left_margin,
                                       int* right_margin,
                                       int top_edge_overlap);
@@ skipping 33 matching lines @@
   friend class PageActionImageView;
   friend class PageActionWithBadgeView;
   typedef std::vector<ExtensionAction*> PageActions;
   typedef std::vector<PageActionWithBadgeView*> PageActionViews;
 
   // Helper for GetMinimumWidth().  Calculates the incremental minimum width
   // |view| should add to the trailing width after the omnibox.
   int IncrementalMinimumWidth(views::View* view) const;
 
   // Returns the thickness of any visible edge, in pixels.
-  int GetEdgeThickness() const;
+  int GetHorizontalEdgeThickness() const;
+  int GetVerticalEdgeThickness() const;
 
-  // The vertical padding to be applied to all contained views.
-  int VerticalPadding() const;
+  // Returns the total amount of space reserved above or below the content,
+  // which is the vertical edge thickness plus the padding next to it.  If
+  // |for_bubble| is true, this computes the relevant value for bubbles as
+  // opposed to normal content (e.g. the omnibox).
+  int GetVerticalEdgeThicknessWithPadding(bool for_bubble) const;
 
   // Updates |location_icon_view_| based on the current state and theme.
   void RefreshLocationIcon();
 
   // Updates the visibility state of the Content Blocked icons to reflect what
   // is actually blocked on the current page. Returns true if the visibility
   // of at least one of the views in |content_setting_views_| changed.
   bool RefreshContentSettingViews();
 
   // Clears |page_action_views_| and removes the elements from the view
@@ skipping 182 matching lines @@
   BooleanPrefMember edit_bookmarks_enabled_;
 
   // This is a debug state variable that stores if the WebContents was null
   // during the last RefreshPageAction.
   bool web_contents_null_at_last_refresh_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_