Move UI-relevant Windows files to ui/base.

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

 // Copyright (c) 2011 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/infobars/infobars.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/infobars/infobar_container.h"
 #include "chrome/browser/ui/views/infobars/infobar_text_button.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/animation/slide_animation.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/hwnd_util.h"
+#include "ui/base/win/hwnd_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;
@@ skipping 202 matching lines @@
   if (container_)
     container_->InfoBarAnimated(false);
 }
 
 void InfoBar::AnimateClose() {
   bool restore_focus = true;
 #if defined(OS_WIN)
   // Do not restore focus (and active state with it) on Windows if some other
   // top-level window became active.
   if (GetWidget() &&
-      !app::win::DoesWindowBelongToActiveWindow(GetWidget()->GetNativeView())) {
+      !ui::DoesWindowBelongToActiveWindow(GetWidget()->GetNativeView())) {
     restore_focus = false;
   }
 #endif  // defined(OS_WIN)
   DestroyFocusTracker(restore_focus);
   animation_->Hide();
 }
 
 void InfoBar::Close() {
   GetParent()->RemoveChildView(this);
   // Note that we only tell the delegate we're closed here, and not when we're
@@ skipping 343 matching lines @@
 
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 
 // ConfirmInfoBarDelegate, InfoBarDelegate overrides: --------------------------
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }