Clean up a few bits of files that I'm about to modify. The only visible chan...

chrome/browser/views/infobars/infobars.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/views/infobars/infobars.h"
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
 #include "base/message_loop.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/background.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/widget/widget.h"
 
 // static
 const double InfoBar::kTargetHeight = 37.0;
 
 static const int kVerticalPadding = 3;
 static const int kHorizontalPadding = 3;
 static const int kIconLabelSpacing = 5;
 static const int kButtonSpacing = 5;
-static const int kWordSpacing = 2;
 
 static const SkColor kInfoBackgroundColorTop = SkColorSetRGB(170, 214, 112);
 static const SkColor kInfoBackgroundColorBottom = SkColorSetRGB(146, 205, 114);
 
 static const SkColor kWarningBackgroundColorTop = SkColorSetRGB(255, 242, 183);
 static const SkColor kWarningBackgroundColorBottom =
     SkColorSetRGB(250, 230, 145);
 
 static const SkColor kErrorBackgroundColorTop = kWarningBackgroundColorTop;
 static const SkColor kErrorBackgroundColorBottom =
@@ skipping 337 matching lines @@
   // Layout the left label.
   gfx::Size label_1_ps = label_1_->GetPreferredSize();
   label_1_->SetBounds(label_1_x, OffsetY(this, label_1_ps), label_1_ps.width(),
                       label_1_ps.height());
 
   // Layout the link.
   gfx::Size link_ps = link_->GetPreferredSize();
   bool has_second_label = !label_2_->GetText().empty();
   if (has_second_label) {
     // Embed the link in the text string between the two labels.
-    link_->SetBounds(label_1_->bounds().right() + kWordSpacing,
+    link_->SetBounds(label_1_->bounds().right(),
                      OffsetY(this, link_ps), link_ps.width(), link_ps.height());
   } else {
     // Right-align the link toward the edge of the InfoBar.
     link_->SetBounds(label_1_x + available_width - link_ps.width(),
                      OffsetY(this, link_ps), link_ps.width(), link_ps.height());
   }
 
   // Layout the right label (we do this regardless of whether or not it has
   // text).
   gfx::Size label_2_ps = label_2_->GetPreferredSize();
-  label_2_->SetBounds(link_->bounds().right() + kWordSpacing,
+  label_2_->SetBounds(link_->bounds().right(),
                       OffsetY(this, label_2_ps), label_2_ps.width(),
                       label_2_ps.height());
 }
 
 // LinkInfoBar, private: -------------------------------------------------------
 
 LinkInfoBarDelegate* LinkInfoBar::GetDelegate() {
   return delegate()->AsLinkInfoBarDelegate();
 }
 
@@ skipping 100 matching lines @@
 
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 
 // ConfirmInfoBarDelegate, InfoBarDelegate overrides: --------------------------
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }