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

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
index ed7038bda8ea5ad61ee625254a4ff000a7b42a56..d8578e0533b28700c297add16e036ebe87f3c43e 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc
@@ -20,7 +20,11 @@
 
 
 namespace {
-const int kBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);
+const int kBackgroundImages[] = {
+  IDR_OMNIBOX_CONTENT_SETTING_BUBBLE_LEFT,
+  IDR_OMNIBOX_CONTENT_SETTING_BUBBLE_CENTER,
+  IDR_OMNIBOX_CONTENT_SETTING_BUBBLE_RIGHT,
+};
 const int kStayOpenTimeMS = 3200;  // Time spent with animation fully open.
 }
 
@@ -41,8 +45,7 @@ ContentSettingImageView::ContentSettingImageView(
       content_setting_image_model_(
           ContentSettingImageModel::CreateContentSettingImageModel(
               content_type)),
-      background_painter_(
-          views::Painter::CreateImageGridPainter(kBackgroundImages)),
+      background_painter_(new views::HorizontalPainter(kBackgroundImages)),
       icon_(new views::ImageView),
       text_label_(new views::Label),
       slide_animator_(this),
@@ -66,7 +69,7 @@ ContentSettingImageView::ContentSettingImageView(
   // sit atop.
   const SkBitmap& bitmap(
       ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          kBackgroundImages[4])->GetRepresentation(
+          kBackgroundImages[1])->GetRepresentation(
           ui::SCALE_FACTOR_100P).sk_bitmap());
   SkAutoLockPixels pixel_lock(bitmap);
   SkColor background_image_color =