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

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/autofill/save_card_bubble_controller_impl.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/autofill/save_card_icon_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/background_with_1_px_border.h"
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_layout.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
 #include "chrome/browser/ui/views/location_bar/star_view.h"
@@ skipping 109 matching lines @@
   if (template_url_service_)
     template_url_service_->RemoveObserver(this);
 
   ui_zoom::ZoomEventManager::GetForBrowserContext(profile())
       ->RemoveZoomEventManagerObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public:
 
+// static
+SkColor LocationBarView::GetBorderColor(bool incognito) {
+  return color_utils::AlphaBlend(
+      SkColorSetA(kBorderColor, SK_AlphaOPAQUE),
+      ThemeProperties::GetDefaultColor(ThemeProperties::COLOR_TOOLBAR,
+                                       incognito),
+      SkColorGetA(kBorderColor));
+}
+
 void LocationBarView::Init() {
   // We need to be in a Widget, otherwise GetNativeTheme() may change and we're
   // not prepared for that.
   DCHECK(GetWidget());
 
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     if (is_popup_mode_) {
       const int kOmniboxPopupBorderImages[] =
           IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW);
       border_painter_.reset(
@@ skipping 10 matching lines @@
   gfx::FontList font_list = ResourceBundle::GetSharedInstance().GetFontList(
       ResourceBundle::BaseFont);
   const int current_font_size = font_list.GetFontSize();
   const int desired_font_size = GetLayoutConstant(OMNIBOX_FONT_PIXEL_SIZE);
   if (current_font_size != desired_font_size) {
     font_list =
         font_list.DeriveWithSizeDelta(desired_font_size - current_font_size);
   }
   // Shrink large fonts to make them fit.
   // TODO(pkasting): Stretch the location bar instead in this case.
-  const int location_height = GetInternalHeight(true);
+  const int vertical_padding = GetVerticalEdgeThicknessWithPadding(false);
+  const int location_height =
+      std::max(GetPreferredSize().height() - (vertical_padding * 2), 0);
   font_list = font_list.DeriveWithHeightUpperBound(location_height);
 
   // Determine the font for use inside the bubbles.  The bubble background
   // images have 1 px thick edges, which we don't want to overlap.
   const int kBubbleInteriorVerticalPadding =
       ui::MaterialDesignController::IsModeMaterial() ? 2 : 1;
   const int bubble_padding =
-      GetEdgeThickness() +
-      GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING) +
+      GetVerticalEdgeThicknessWithPadding(true) +
       kBubbleInteriorVerticalPadding;
   const int bubble_height = GetPreferredSize().height() - (bubble_padding * 2);
   gfx::FontList bubble_font_list =
       font_list.DeriveWithHeightUpperBound(bubble_height);
 
   const SkColor background_color = GetColor(BACKGROUND);
   location_icon_view_ =
       new LocationIconView(bubble_font_list, background_color, this);
   location_icon_view_->set_drag_controller(this);
   AddChildView(location_icon_view_);
@@ skipping 234 matching lines @@
   const views::ImageView* image = location_icon_view_->GetImageView();
   // The +1 in the next line creates a 1-px gap between icon and arrow tip.
   int icon_bottom = image->GetImageBounds().bottom() -
                     GetLayoutConstant(ICON_LABEL_VIEW_TRAILING_PADDING) + 1;
   gfx::Point icon_center(image->GetImageBounds().CenterPoint());
   gfx::Point point(icon_center.x(), icon_bottom);
   ConvertPointToTarget(image, this, &point);
   return point;
 }
 
-int LocationBarView::GetInternalHeight(bool use_preferred_size) {
-  int total_height =
-      use_preferred_size ? GetPreferredSize().height() : height();
-  return std::max(total_height - (VerticalPadding() * 2), 0);
-}
-
 void LocationBarView::GetOmniboxPopupPositioningInfo(
     gfx::Point* top_left_screen_coord,
     int* popup_width,
     int* left_margin,
     int* right_margin,
     int top_edge_overlap) {
   *top_left_screen_coord = gfx::Point(0, parent()->height() - top_edge_overlap);
   views::View::ConvertPointToScreen(parent(), top_left_screen_coord);
 
   *popup_width = parent()->width();
   gfx::Rect location_bar_bounds(bounds());
-  location_bar_bounds.Inset(GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS),
-                            0);
+  location_bar_bounds.Inset(GetHorizontalEdgeThickness(), 0);
   *left_margin = location_bar_bounds.x();
   *right_margin = *popup_width - location_bar_bounds.right();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public LocationBar implementation:
 
 void LocationBarView::FocusLocation(bool select_all) {
   omnibox_view_->SetFocus();
   if (select_all)
@@ skipping 16 matching lines @@
 }
 
 void LocationBarView::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_GROUP;
 }
 
 gfx::Size LocationBarView::GetPreferredSize() const {
   // Compute minimum height.
   gfx::Size min_size;
   if (ui::MaterialDesignController::IsModeMaterial() || is_popup_mode_) {
-    const int height = GetLayoutConstant(LOCATION_BAR_HEIGHT);
-    const int edge_thickness = views::NonClientFrameView::kClientEdgeThickness;
-    min_size.set_height(height - (is_popup_mode_ ? (2 * edge_thickness) : 0));
+    min_size.set_height(GetLayoutConstant(LOCATION_BAR_HEIGHT));
   } else {
     min_size = border_painter_->GetMinimumSize();
   }
 
   if (!IsInitialized())
     return min_size;
 
   min_size.set_height(min_size.height() * size_animation_.GetCurrentValue());
 
   const int padding = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
 
   // Compute width of omnibox-leading content.
-  const int edge_thickness = GetEdgeThickness();
+  const int edge_thickness = GetHorizontalEdgeThickness();
   int leading_width = edge_thickness;
   if (ShouldShowKeywordBubble()) {
     // The selected keyword view can collapse completely.
   } else if (ShouldShowEVBubble()) {
     leading_width += GetLayoutConstant(LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING) +
                      location_icon_view_->GetMinimumSizeForLabelText(
                                             GetToolbarModel()->GetEVCertName())
                          .width();
   } else {
     leading_width += padding + location_icon_view_->GetMinimumSize().width();
@@ skipping 22 matching lines @@
 
 void LocationBarView::Layout() {
   if (!IsInitialized())
     return;
 
   selected_keyword_view_->SetVisible(false);
   location_icon_view_->SetVisible(false);
   keyword_hint_view_->SetVisible(false);
 
   const int item_padding = GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING);
-  const int edge_thickness = GetEdgeThickness();
+  const int edge_thickness = GetHorizontalEdgeThickness();
   int trailing_edge_item_padding = 0;
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     trailing_edge_item_padding =
         item_padding - edge_thickness - omnibox_view_->GetInsets().right();
   }
 
   LocationBarLayout leading_decorations(
       LocationBarLayout::LEFT_EDGE, item_padding,
       item_padding - omnibox_view_->GetInsets().left() -
           GetEditLeadingInternalSpace());
   LocationBarLayout trailing_decorations(
       LocationBarLayout::RIGHT_EDGE, item_padding, trailing_edge_item_padding);
 
   const base::string16 keyword(omnibox_view_->model()->keyword());
   // In some cases (e.g. fullscreen mode) we may have 0 height.  We still want
   // to position our child views in this case, because other things may be
   // positioned relative to them (e.g. the "bookmark added" bubble if the user
   // hits ctrl-d).
-  const int bubble_vertical_padding =
-      edge_thickness + GetLayoutConstant(LOCATION_BAR_BUBBLE_VERTICAL_PADDING);
+  const int bubble_vertical_padding = GetVerticalEdgeThicknessWithPadding(true);
   const int bubble_height =
       std::max(height() - (bubble_vertical_padding * 2), 0);
   const int bubble_horizontal_padding =
       GetLayoutConstant(LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING);
-  const int location_height = GetInternalHeight(false);
-  const int vertical_padding = VerticalPadding();
+  const int vertical_padding = GetVerticalEdgeThicknessWithPadding(false);
+  const int location_height = std::max(height() - (vertical_padding * 2), 0);
 
   location_icon_view_->SetLabel(base::string16());
   location_icon_view_->SetBackground(false);
   if (ShouldShowKeywordBubble()) {
     leading_decorations.AddDecoration(bubble_vertical_padding, bubble_height,
                                       true, 0, bubble_horizontal_padding,
                                       item_padding, selected_keyword_view_);
     if (selected_keyword_view_->keyword() != keyword) {
       selected_keyword_view_->SetKeyword(keyword);
       const TemplateURL* template_url =
@@ skipping 228 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private:
 
 int LocationBarView::IncrementalMinimumWidth(views::View* view) const {
   return view->visible() ?
       (GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING) +
           view->GetMinimumSize().width()) : 0;
 }
 
-int LocationBarView::GetEdgeThickness() const {
+int LocationBarView::GetHorizontalEdgeThickness() const {
   return is_popup_mode_ ? 0 : GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS);
 }
 
-int LocationBarView::VerticalPadding() const {
-  return is_popup_mode_ ? 0 : GetLayoutConstant(LOCATION_BAR_VERTICAL_PADDING);
+int LocationBarView::GetVerticalEdgeThickness() const {
+  if (ui::MaterialDesignController::IsModeMaterial())
+    return GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS);
+  return is_popup_mode_ ? views::NonClientFrameView::kClientEdgeThickness
+                        : GetLayoutConstant(LOCATION_BAR_BORDER_THICKNESS);
+}
+
+int LocationBarView::GetVerticalEdgeThicknessWithPadding(
+    bool for_bubble) const {
+  return GetVerticalEdgeThickness() +
+      GetLayoutConstant(for_bubble ? LOCATION_BAR_BUBBLE_VERTICAL_PADDING
+                                   : LOCATION_BAR_VERTICAL_PADDING);
 }
 
 void LocationBarView::RefreshLocationIcon() {
   // |omnibox_view_| may not be ready yet if Init() has not been called. The
   // icon will be set soon by OnChanged().
   if (!omnibox_view_)
     return;
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
@@ skipping 400 matching lines @@
 void LocationBarView::OnPaint(gfx::Canvas* canvas) {
   View::OnPaint(canvas);
 
   if (ui::MaterialDesignController::IsModeMaterial() && !is_popup_mode_)
     return;  // The background and border are painted by our Background.
 
   // Fill the location bar background color behind the border.  Parts of the
   // border images are meant to rest atop the toolbar background and parts atop
   // the omnibox background, so we can't just blindly fill our entire bounds.
   gfx::Rect bounds(GetContentsBounds());
-  const int edge_thickness = GetEdgeThickness();
-  bounds.Inset(edge_thickness, edge_thickness);
+  bounds.Inset(GetHorizontalEdgeThickness(),
+               is_popup_mode_ ? 0 : GetVerticalEdgeThickness());
   SkColor background_color(GetColor(BACKGROUND));
-  if (is_popup_mode_) {
-    canvas->FillRect(bounds, background_color);
-  } else {
+  if (!is_popup_mode_) {
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(background_color);
     const int kBorderCornerRadius = 2;
     canvas->DrawRoundRect(bounds, kBorderCornerRadius, paint);
     // The border itself will be drawn in PaintChildren() since it includes an
     // inner shadow which should be drawn over the contents.
+    return;
   }
+
+  canvas->FillRect(bounds, background_color);
+  const SkColor border_color = GetBorderColor(profile()->IsOffTheRecord());
+  BrowserView::Paint1pxHorizontalLine(canvas, border_color, bounds, false);
+  BrowserView::Paint1pxHorizontalLine(canvas, border_color, bounds, true);
 }
 
 void LocationBarView::PaintChildren(const ui::PaintContext& context) {
   View::PaintChildren(context);
 
   ui::PaintRecorder recorder(context, size());
 
   // For non-InstantExtendedAPI cases, if necessary, show focus rect. As we need
   // the focus rect to appear on top of children we paint here rather than
   // OnPaint().
@@ skipping 80 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }