alternate ntp: implement right-aligned search token

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/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 
 namespace {
 
 // Amount of padding at the edges of the bubble.
 //
 // This can't be statically initialized because
 // LocationBarView::GetEdgeItemPadding() depends on whether we are
 // using desktop or touch layout, and this in turn depends on the
 // command line.
 int GetBubbleOuterPadding() {
   return LocationBarView::GetEdgeItemPadding() -
       LocationBarView::kBubbleHorizontalPadding;
 }
 
-// Amount of padding after the label.
-const int kLabelPadding = 5;
-
 }  // namespace
 
 IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
                                          int contained_image,
                                          SkColor color)
     : background_painter_(background_images),
       is_extension_icon_(false) {
   image_ = new views::ImageView();
-  image_->SetImage(
-      ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-          contained_image));
+  if (contained_image > -1) {
+    image_->SetImage(
+        ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            contained_image));
+    image_->SetVisible(true);
+  } else  {
+    image_->SetVisible(false);
+  }
   AddChildView(image_);
 
   label_ = new views::Label();
   label_->SetAutoColorReadabilityEnabled(false);
   label_->SetEnabledColor(color);
   AddChildView(label_);
 }
 
 IconLabelBubbleView::~IconLabelBubbleView() {
 }
 
 void IconLabelBubbleView::SetFont(const gfx::Font& font) {
   label_->SetFont(font);
 }
 
 void IconLabelBubbleView::SetLabel(const string16& label) {
   label_->SetText(label);
 }
 
 void IconLabelBubbleView::SetImage(const gfx::ImageSkia& image_skia) {
   image_->SetImage(image_skia);
+  image_->SetVisible(true);
 }
 
 void IconLabelBubbleView::SetLabelBackgroundColor(SkColor color) {
   label_->SetBackgroundColor(color);
 }
 
 void IconLabelBubbleView::OnPaint(gfx::Canvas* canvas) {
   background_painter_.Paint(canvas, size());
 }
 
 gfx::Size IconLabelBubbleView::GetPreferredSize() {
   gfx::Size size(GetNonLabelSize());
   size.Enlarge(label_->GetPreferredSize().width(), 0);
   return size;
 }
 
 void IconLabelBubbleView::Layout() {
-  image_->SetBounds(GetBubbleOuterPadding() +
-      (is_extension_icon_ ? LocationBarView::kIconInternalPadding : 0), 0,
-      image_->GetPreferredSize().width(), height());
+  if (image_->visible()) {
+    image_->SetBounds(GetBubbleOuterPadding() +
+        (is_extension_icon_ ? LocationBarView::kIconInternalPadding : 0), 0,
+        image_->GetPreferredSize().width(), height());
+  }
   const int label_height = label_->GetPreferredSize().height();
   label_->SetBounds(GetPreLabelWidth(), (height() - label_height) / 2,
                     width() - GetNonLabelWidth(), label_height);
 }
 
 void IconLabelBubbleView::SetElideInMiddle(bool elide_in_middle) {
   label_->SetElideBehavior(
       elide_in_middle ? views::Label::ELIDE_IN_MIDDLE : views::Label::NO_ELIDE);
 }
 
 gfx::Size IconLabelBubbleView::GetNonLabelSize() const {
   return gfx::Size(GetNonLabelWidth(), background_painter_.height());
 }
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
+  if (!image_->visible())
+    return GetBubbleOuterPadding();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return GetBubbleOuterPadding() +
       rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)->width() +
       LocationBarView::GetItemPadding();
 }
 
 int IconLabelBubbleView::GetNonLabelWidth() const {
   return GetPreLabelWidth() + GetBubbleOuterPadding();
 }