alternate ntp: implement right-aligned search token

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

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 2b466066e5dd88274c23467739515ee6ea956e27..3272227c3d58e2e50e9f786f5eef1754151e0a3d 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
@@ -25,9 +25,6 @@ int GetBubbleOuterPadding() {
       LocationBarView::kBubbleHorizontalPadding;
 }
 
-// Amount of padding after the label.
-const int kLabelPadding = 5;
-
 }  // namespace
 
 IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
@@ -36,9 +33,14 @@ IconLabelBubbleView::IconLabelBubbleView(const int background_images[],
     : 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();
@@ -60,6 +62,7 @@ void IconLabelBubbleView::SetLabel(const string16& label) {
 
 void IconLabelBubbleView::SetImage(const gfx::ImageSkia& image_skia) {
   image_->SetImage(image_skia);
+  image_->SetVisible(true);
 }
 
 void IconLabelBubbleView::SetLabelBackgroundColor(SkColor color) {
@@ -77,9 +80,11 @@ gfx::Size IconLabelBubbleView::GetPreferredSize() {
 }
 
 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);
@@ -95,6 +100,8 @@ gfx::Size IconLabelBubbleView::GetNonLabelSize() const {
 }
 
 int IconLabelBubbleView::GetPreLabelWidth() const {
+  if (!image_->visible())
+    return GetBubbleOuterPadding();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return GetBubbleOuterPadding() +
       rb.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH)->width() +