Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(870)

Unified Diff: chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

Issue 16254009: Revert "Increase omnibox size by 2 px. Increase nominal font size in omnibox to 16 px." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
index a4a193c59e326181c7f676d7a0ea6decef9dc345..e52dac1ef5a742772b4f30e3bce826d3dae19b0a 100644
--- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
+++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -22,8 +22,7 @@ IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
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) {
@@ -44,7 +43,7 @@ IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
// 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 =
« no previous file with comments | « chrome/browser/ui/views/location_bar/ev_bubble_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698