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

 // 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/content_setting_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 
 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.
 }
 
 
 // static
 const int ContentSettingImageView::kOpenTimeMS = 150;
 const int ContentSettingImageView::kAnimationDurationMS =
     (kOpenTimeMS * 2) + kStayOpenTimeMS;
 
 ContentSettingImageView::ContentSettingImageView(
     ContentSettingsType content_type,
     LocationBarView* parent,
     const gfx::Font& font,
     int font_y_offset,
     SkColor text_color,
     SkColor parent_background_color)
     : parent_(parent),
       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),
       pause_animation_(false),
       pause_animation_state_(0.0),
       bubble_widget_(NULL) {
   icon_->SetHorizontalAlignment(views::ImageView::LEADING);
   AddChildView(icon_);
 
   text_label_->SetVisible(false);
   text_label_->set_border(
       views::Border::CreateEmptyBorder(font_y_offset, 0, 0, 0));
   text_label_->SetFont(font);
   text_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(
-          kBackgroundImages[4])->GetRepresentation(
+          kBackgroundImages[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.
   text_label_->SetBackgroundColor(
       color_utils::AlphaBlend(SkColorSetA(background_image_color, 255),
@@ skipping 173 matching lines @@
         parent_->delegate()->CreateViewsBubble(new ContentSettingBubbleContents(
             ContentSettingBubbleModel::CreateContentSettingBubbleModel(
                 parent_->delegate()->GetContentSettingBubbleModelDelegate(),
                 web_contents, parent_->profile(),
                 content_setting_image_model_->get_content_settings_type()),
             web_contents, this, views::BubbleBorder::TOP_RIGHT));
     bubble_widget_->AddObserver(this);
     bubble_widget_->Show();
   }
 }