Changed omnibox rendering to use a single asset.

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 160 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, public:
 
 void LocationBarView::Init() {
   // We need to be in a Widget, otherwise GetNativeTheme() may change and we're
   // not prepared for that.
   DCHECK(GetWidget());
 
-  const int kOmniboxPopupBorderImages[] =
-      IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW);
-  const int kOmniboxBorderImages[] = IMAGE_GRID(IDR_TEXTFIELD);
-  border_painter_.reset(views::Painter::CreateImageGridPainter(
-      is_popup_mode_ ? kOmniboxPopupBorderImages : kOmniboxBorderImages));
+  CreateBorderPainter();

[Peter Kasting, 2015/07/10 15:57:09]

Just leave your new code inlined here instead of creating a new function.

[bruthig, 2015/07/10 17:04:09]

Done.

 
   location_icon_view_ = new LocationIconView(this);
   location_icon_view_->set_drag_controller(this);
   AddChildView(location_icon_view_);
 
   // 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 = browser_defaults::kOmniboxFontPixelSize;
@@ skipping 633 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private:
 
 // static
 int LocationBarView::IncrementalMinimumWidth(views::View* view) {
   return view->visible() ? (kItemPadding + view->GetMinimumSize().width()) : 0;
 }
 
+void LocationBarView::CreateBorderPainter() {
+  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));
+  }
+}
+
 int LocationBarView::GetHorizontalEdgeThickness() const {
   // In maximized popup mode, there isn't any edge.
   return (is_popup_mode_ && browser_ && browser_->window() &&
       browser_->window()->IsMaximized()) ? 0 : vertical_edge_thickness();
 }
 
 bool LocationBarView::RefreshContentSettingViews() {
   bool visibility_changed = false;
   for (ContentSettingViews::const_iterator i(content_setting_views_.begin());
        i != content_setting_views_.end(); ++i) {
@@ skipping 516 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }