Update appearance of omnibox focus for MD.

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 85 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.
 const SkColor kBorderColor = SkColorSetA(SK_ColorBLACK, 0x4D);

[Evan Stade, 2016/05/20 00:56:41]

I'm going to look at whether we can align this with UnfocusedBorderColor as a
TODO

 
 int GetEditLeadingInternalSpace() {
   // The textfield has 1 px of whitespace before the text in the RTL case only.
   return base::i18n::IsRTL() ? 1 : 0;
 }
 
 }  // namespace
 
 
 // LocationBarView -----------------------------------------------------------
@@ skipping 1134 matching lines @@
   return kViewClassName;
 }
 
 void LocationBarView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   OmniboxPopupView* popup = omnibox_view_->model()->popup_model()->view();
   if (popup->IsOpen())
     popup->UpdatePopupAppearance();
 }
 
 void LocationBarView::OnFocus() {
-  // Explicitly focus the omnibox so a focus ring will be displayed around it on
-  // Windows.
   omnibox_view_->SetFocus();
 }
 
+void LocationBarView::OnBlur() {
+  SchedulePaint();

[sky, 2016/05/20 16:08:00]

Is this only necessary if modematerial and show_focus_rect?

[Evan Stade, 2016/05/20 18:02:00]

hmm, turns out this didn't actually work (although at first it seemed like it
did). See updates --- OmniboxViewViews has to do this in its OnBlur. Observing
the focus manager from LocationBarView is a pain because of the need to remove
the listener when either |this| or the widget is destructing.

Also, I found that OnSetFocus() was dead code on Views and not necessary on
Cocoa, so I removed that.

+}
+
 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.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    if (show_focus_rect_ && HasFocus()) {
+      SkPaint paint;
+      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, 2.5f, paint);
+    }
+    if (!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());
   bounds.Inset(GetHorizontalEdgeThickness(),
                is_popup_mode_ ? 0 : GetVerticalEdgeThickness());
   SkColor background_color(GetColor(BACKGROUND));
   if (!is_popup_mode_) {
     SkPaint paint;
@@ skipping 14 matching lines @@
 
 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().
   // Note: |Canvas::DrawFocusRect| paints a dashed rect with gray color.
-  if (show_focus_rect_ && HasFocus())
+  if (!ui::MaterialDesignController::IsModeMaterial() && show_focus_rect_ &&
+      HasFocus()) {
     recorder.canvas()->DrawFocusRect(omnibox_view_->bounds());
+  }
 
   if (!ui::MaterialDesignController::IsModeMaterial() && !is_popup_mode_) {
     views::Painter::PaintPainterAt(recorder.canvas(), border_painter_.get(),
                                    GetContentsBounds());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private views::DragController implementation:
 
@@ skipping 67 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();
 }