[MD] Don't allow overflowing location icons to appear on top of toolbar

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 161 matching lines @@
       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(
-          views::Painter::CreateImageGridPainter(kOmniboxPopupBorderImages));
-    } else {
-      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-      const gfx::Insets omnibox_border_insets(14, 9, 14, 9);
-      border_painter_.reset(views::Painter::CreateImagePainter(
-          *rb.GetImageSkiaNamed(IDR_OMNIBOX_BORDER), omnibox_border_insets));
-    }
-  }
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    // Make sure children with layers are clipped. See http://crbug.com/589497
+    SetPaintToLayer(true);
+    SetFillsBoundsOpaquely(false);
+    layer()->SetMasksToBounds(true);
+  } else if (is_popup_mode_) {
+    const int kOmniboxPopupBorderImages[] =
+        IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW);
+    border_painter_.reset(
+        views::Painter::CreateImageGridPainter(kOmniboxPopupBorderImages));
+  } else {
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    const gfx::Insets omnibox_border_insets(14, 9, 14, 9);
+    border_painter_.reset(views::Painter::CreateImagePainter(
+        *rb.GetImageSkiaNamed(IDR_OMNIBOX_BORDER), omnibox_border_insets));
+}
 
   // Determine the main font.
   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);
   }
@@ skipping 1189 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();
 }