Move UI-relevant Windows files to ui/base.

BUG=none
TEST=none
TBR=brettw

Review URL: http://codereview.chromium.org/6254011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71854 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
index c2de10a..14e7453 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -42,8 +42,8 @@
 #include <dwmapi.h>
 #include <objidl.h>
 
-#include "app/win/hwnd_util.h"
 #include "base/win/scoped_gdi_object.h"
+#include "ui/base/win/hwnd_util.h"
 #endif
 
 #if defined(OS_LINUX)
@@ -1107,7 +1107,7 @@ void AutocompletePopupContentsView::MakeContentsPath(
 void AutocompletePopupContentsView::UpdateBlurRegion() {
 #if defined(OS_WIN)
   // We only support background blurring on Vista with Aero-Glass enabled.
-  if (!app::win::ShouldUseVistaFrame() || !GetWidget())
+  if (!ui::ShouldUseVistaFrame() || !GetWidget())
     return;
 
   // Provide a blurred background effect within the contents region of the
diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc
index ac1d0d2..b2270ef 100644
--- a/chrome/browser/ui/views/constrained_window_win.cc
+++ b/chrome/browser/ui/views/constrained_window_win.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "app/resource_bundle.h"
-#include "app/win/hwnd_util.h"
 #include "app/win/win_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
@@ -27,6 +26,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "ui/base/win/hwnd_util.h"
 #include "views/controls/button/image_button.h"
 #include "views/focus/focus_manager.h"
 #include "views/window/client_view.h"
@@ -198,7 +198,7 @@ class ConstrainedWindowFrameView
 
   SkColor GetTitleColor() const {
     return (container_->owner()->profile()->IsOffTheRecord() ||
-        !app::win::ShouldUseVistaFrame()) ? SK_ColorWHITE : SK_ColorBLACK;
+        !ui::ShouldUseVistaFrame()) ? SK_ColorWHITE : SK_ColorBLACK;
   }
 
   // Loads the appropriate set of WindowResources for the frame view.
@@ -535,7 +535,7 @@ gfx::Rect ConstrainedWindowFrameView::CalculateClientAreaBounds(
 }
 
 void ConstrainedWindowFrameView::InitWindowResources() {
-  resources_.reset(app::win::ShouldUseVistaFrame() ?
+  resources_.reset(ui::ShouldUseVistaFrame() ?
     static_cast<views::WindowResources*>(new VistaWindowResources) :
     new XPWindowResources);
 }
diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc
index bf70f64..895e151 100644
--- a/chrome/browser/ui/views/first_run_bubble.cc
+++ b/chrome/browser/ui/views/first_run_bubble.cc
@@ -7,7 +7,6 @@
 #include "app/gfx/font_util.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/win/hwnd_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
@@ -19,6 +18,7 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "ui/base/win/hwnd_util.h"
 #include "views/event.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/image_button.h"
@@ -358,7 +358,7 @@ gfx::Size FirstRunOEMBubbleView::GetPreferredSize() {
   // now, we force Vista to show a correctly-sized box by taking account of
   // the difference in font size calculation. The coefficient should not be
   // stored in a variable because it's a hack and should go away.
-  if (app::win::ShouldUseVistaFrame()) {
+  if (ui::ShouldUseVistaFrame()) {
     size.set_width(static_cast<int>(size.width() * 0.85));
     size.set_height(static_cast<int>(size.height() * 0.85));
   }
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc
index ef58aba..50f9cc4 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc
@@ -9,7 +9,6 @@
 
 #include <set>
 
-#include "app/win/hwnd_util.h"
 #include "app/win/win_util.h"
 #include "chrome/browser/accessibility/browser_accessibility_state.h"
 #include "chrome/browser/profiles/profile.h"
@@ -21,6 +20,7 @@
 #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
 #include "gfx/font.h"
 #include "grit/theme_resources.h"
+#include "ui/base/win/hwnd_util.h"
 #include "views/screen.h"
 #include "views/window/window_delegate.h"
 
@@ -109,7 +109,7 @@ bool BrowserFrameWin::AlwaysUseNativeFrame() const {
   // We don't theme popup or app windows, so regardless of whether or not a
   // theme is active for normal browser windows, we don't want to use the custom
   // frame for popups/apps.
-  if (!browser_view_->IsBrowserTypeNormal() && app::win::ShouldUseVistaFrame())
+  if (!browser_view_->IsBrowserTypeNormal() && ui::ShouldUseVistaFrame())
     return true;
 
   // Otherwise, we use the native frame when we're told we should by the theme
diff --git a/chrome/browser/ui/views/infobars/infobars.cc b/chrome/browser/ui/views/infobars/infobars.cc
index 9698b51..af97d7e 100644
--- a/chrome/browser/ui/views/infobars/infobars.cc
+++ b/chrome/browser/ui/views/infobars/infobars.cc
@@ -24,7 +24,7 @@
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
-#include "app/win/hwnd_util.h"
+#include "ui/base/win/hwnd_util.h"
 #endif
 
 // static
@@ -247,7 +247,7 @@ void InfoBar::AnimateClose() {
   // 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)
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win.cc b/chrome/browser/ui/views/status_icons/status_tray_win.cc
index e4e6d5d..83a12e1 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/views/status_icons/status_tray_win.h"
 
-#include "app/win/hwnd_util.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "chrome/common/chrome_constants.h"
+#include "ui/base/win/hwnd_util.h"
 
 static const UINT kStatusIconMessage = WM_APP + 1;
 
@@ -25,7 +25,7 @@ StatusTrayWin::StatusTrayWin()
   // Create an offscreen window for handling messages for the status icons.
   window_ = CreateWindow(chrome::kStatusTrayWindowClass,
                          0, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hinst, 0);
-  app::win::SetWindowUserData(window_, this);
+  ui::SetWindowUserData(window_, this);
 }
 
 LRESULT CALLBACK StatusTrayWin::WndProcStatic(HWND hwnd,