Slightly simplify location bar bg/border painting.

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"
@@ skipping 87 matching lines @@
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/first_run_bubble.h"
 #endif
 
 using content::WebContents;
 using views::View;
 
 namespace {
 
-// The border color for MD windows, as well as non-MD popup windows.
+// The border color, drawn on top of the toolbar.
 const SkColor kBorderColor = SkColorSetA(SK_ColorBLACK, 0x4D);
 
 }  // namespace
 
 
 // LocationBarView -----------------------------------------------------------
 
 // static
 const char LocationBarView::kViewClassName[] = "LocationBarView";
 
@@ skipping 36 matching lines @@
     template_url_service_->RemoveObserver(this);
 
   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));
+SkColor LocationBarView::GetOpaqueBorderColor(bool incognito) {
+  return color_utils::GetResultingPaintColor(
+      kBorderColor, ThemeProperties::GetDefaultColor(
+                        ThemeProperties::COLOR_TOOLBAR, incognito));
 }
 
 void LocationBarView::Init() {
   // We need to be in a Widget, otherwise GetNativeTheme() may change and we're
   // not prepared for that.
   DCHECK(GetWidget());
 
   // Make sure children with layers are clipped. See http://crbug.com/589497
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
@@ skipping 452 matching lines @@
     location_bounds.set_width(x);
     ime_inline_autocomplete_view_->SetBounds(
         location_bounds.right(), location_bounds.y(),
         std::min(width, entry_width), location_bounds.height());
   }
   omnibox_view_->SetBoundsRect(location_bounds);
 }
 
 void LocationBarView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   RefreshLocationIcon();
-  if (!is_popup_mode_) {
+  if (is_popup_mode_) {
+    set_background(
+        views::Background::CreateSolidBackground(GetColor(BACKGROUND)));
+  } else {
+    // This border color will be blended on top of the toolbar (which may use an
+    // image in the case of themes).
     set_background(
         new BackgroundWith1PxBorder(GetColor(BACKGROUND), kBorderColor));
-    SchedulePaint();
   }
+  SchedulePaint();
 }
 
 void LocationBarView::Update(const WebContents* contents) {
   RefreshContentSettingViews();
   RefreshZoomView();
   RefreshPageActionViews();
   RefreshTranslateIcon();
   RefreshSaveCreditCardIconView();
   RefreshManagePasswordsIconView();
   WebContents* web_contents_for_sub_views =
@@ skipping 483 matching lines @@
     paint.setAntiAlias(true);
     paint.setColor(GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::NativeTheme::kColorId_FocusedBorderColor));
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(1);
     gfx::RectF focus_rect(GetLocalBounds());
     focus_rect.Inset(gfx::InsetsF(0.5f));
     canvas->DrawRoundRect(focus_rect,
                           BackgroundWith1PxBorder::kCornerRadius + 0.5f, paint);
   }
+}
+
+void LocationBarView::OnPaintBorder(gfx::Canvas* canvas) {
   if (!is_popup_mode_)
-    return;  // The background and border are painted by our Background.
+    return;  // The border is 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());
-  bounds.Inset(GetHorizontalEdgeThickness(),
-               is_popup_mode_
-                   ? 0
-                   : BackgroundWith1PxBorder::kLocationBarBorderThicknessDip);
-  SkColor background_color(GetColor(BACKGROUND));
-  canvas->FillRect(bounds, background_color);
-  const SkColor border_color = GetBorderColor(profile()->IsOffTheRecord());
+  const SkColor border_color =
+      GetOpaqueBorderColor(profile()->IsOffTheRecord());
   BrowserView::Paint1pxHorizontalLine(canvas, border_color, bounds, false);
   BrowserView::Paint1pxHorizontalLine(canvas, border_color, bounds, true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private views::DragController implementation:
 
 void LocationBarView::WriteDragDataForView(views::View* sender,
                                            const gfx::Point& press_pt,
                                            OSExchangeData* data) {
@@ skipping 60 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();
 }