Revert "Increase omnibox size by 2 px. Increase nominal font size in omnibox to 16 px."

chrome/browser/ui/views/location_bar/icon_label_bubble_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/icon_label_bubble_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/painter.h"
 
 
 IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
                                          int contained_image,
                                          const gfx::Font& font,
                                          int font_y_offset,
                                          SkColor text_color,
                                          SkColor parent_background_color,
                                          bool elide_in_middle)
-    : background_painter_(
-          views::Painter::CreateImageGridPainter(background_images)),
+    : background_painter_(new views::HorizontalPainter(background_images)),
       image_(new views::ImageView()),
       label_(new views::Label()),
       is_extension_icon_(false) {
   image_->SetImage(
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           contained_image));
   AddChildView(image_);
 
   label_->set_border(views::Border::CreateEmptyBorder(font_y_offset, 0, 0, 0));
   label_->SetFont(font);
   label_->SetEnabledColor(text_color);
   // Calculate the actual background color for the label.  The background images
   // are painted atop |parent_background_color|.  We grab the color of the
   // middle pixel of the middle image of the background, which we treat as the
   // representative color of the entire background (reasonable, given the
   // current appearance of these images).  Then we alpha-blend it over the
   // parent background color to determine the actual color the label text will
   // sit atop.
   const SkBitmap& bitmap(
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          background_images[4])->GetRepresentation(
+          background_images[1])->GetRepresentation(
           ui::SCALE_FACTOR_100P).sk_bitmap());
   SkAutoLockPixels pixel_lock(bitmap);
   SkColor background_image_color =
       bitmap.getColor(bitmap.width() / 2, bitmap.height() / 2);
   // Tricky bit: We alpha blend an opaque version of |background_image_color|
   // against |parent_background_color| using the original image grid color's
   // alpha. This is because AlphaBlend(a, b, 255) always returns |a| unchanged
   // even if |a| is a color with non-255 alpha.
   label_->SetBackgroundColor(
       color_utils::AlphaBlend(SkColorSetA(background_image_color, 255),
@@ skipping 43 matching lines @@
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   background_painter_->Paint(canvas, size());
 }
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
   const int image_width = image_->GetPreferredSize().width();
   return GetBubbleOuterPadding(true) +
       (image_width ? (image_width + LocationBarView::GetItemPadding()) : 0);
 }