2 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
index e6643f3..1fc89f4 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc
@@ -2006,15 +2006,13 @@ void AutocompleteEditViewWin::EmphasizeURLComponents() {
   // Set the baseline emphasis.
   CHARFORMAT cf = {0};
   cf.dwMask = CFM_COLOR;
-  cf.dwEffects = 0;
   const bool is_secure = (scheme_security_level_ == ToolbarModel::SECURE);
   // If we're going to emphasize parts of the text, then the baseline state
   // should be "de-emphasized".  If not, then everything should be rendered in
   // the standard text color.
   cf.crTextColor = skia::SkColorToCOLORREF(LocationBarView::GetColor(is_secure,
       emphasize ? LocationBarView::DEEMPHASIZED_TEXT : LocationBarView::TEXT));
-  SelectAll(false);
-  SetSelectionCharFormat(cf);
+  SetDefaultCharFormat(cf);
 
   if (emphasize) {
     // We've found a host name, give it more emphasis.
diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc
index 1bf1290..c2fc041 100644
--- a/chrome/browser/views/infobars/infobars.cc
+++ b/chrome/browser/views/infobars/infobars.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -28,7 +28,6 @@ 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);
@@ -386,7 +385,7 @@ void LinkInfoBar::Layout() {
   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.
@@ -397,7 +396,7 @@ void LinkInfoBar::Layout() {
   // 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());
 }