Handful of related instant changes:

chrome/browser/ui/views/infobars/infobars.cc

 // Copyright (c) 2010 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/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#endif  // defined(OS_WIN)
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/infobars/infobar_container.h"
 #include "gfx/canvas.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"
 
+#if defined(OS_WIN)
+#include "app/win_util.h"
+#endif
+
 // static
 const double InfoBar::kDefaultTargetHeight = 36.0;
 const int InfoBar::kHorizontalPadding = 6;
 const int InfoBar::kIconLabelSpacing = 6;
 const int InfoBar::kButtonButtonSpacing = 10;
 const int InfoBar::kEndOfLabelSpacing = 16;
 const int InfoBar::kCloseButtonSpacing = 12;
 const int InfoBar::kButtonInLabelSpacing = 5;
 
 static const SkColor kWarningBackgroundColorTop = SkColorSetRGB(255, 242, 183);
@@ skipping 567 matching lines @@
 
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 
 // ConfirmInfoBarDelegate, InfoBarDelegate overrides: --------------------------
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }