Move UI-relevant Windows files to ui/base.

views/window/window_win.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 "views/window/window_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "app/theme_provider.h"
-#include "app/win/hwnd_util.h"
 #include "app/win/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/win/windows_version.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/font.h"
 #include "gfx/icon_util.h"
 #include "gfx/path.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/win/hwnd_util.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/widget/root_view.h"
 #include "views/window/client_view.h"
 #include "views/window/custom_frame_view.h"
 #include "views/window/native_frame_view.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window_delegate.h"
 
 namespace {
 
@@ skipping 503 matching lines @@
   return non_client_view_->client_view();
 }
 
 gfx::NativeWindow WindowWin::GetNativeWindow() const {
   return GetNativeView();
 }
 
 bool WindowWin::ShouldUseNativeFrame() const {
   ThemeProvider* tp = GetThemeProvider();
   if (!tp)
-    return app::win::ShouldUseVistaFrame();
+    return ui::ShouldUseVistaFrame();
   return tp->ShouldUseNativeFrame();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowWin, protected:
 
 WindowWin::WindowWin(WindowDelegate* window_delegate)
     : WidgetWin(),
       focus_on_creation_(true),
       window_delegate_(window_delegate),
@@ skipping 34 matching lines @@
   is_modal_ = window_delegate_->IsModal();
   if (is_modal_)
     BecomeModal();
 
   if (window_style() == 0)
     set_window_style(CalculateWindowStyle());
   if (window_ex_style() == 0)
     set_window_ex_style(CalculateWindowExStyle());
 
   WidgetWin::Init(parent, bounds);
-  app::win::SetWindowUserData(GetNativeView(), this);
+  ui::SetWindowUserData(GetNativeView(), this);
 
   // Create the ClientView, add it to the NonClientView and add the
   // NonClientView to the RootView. This will cause everything to be parented.
   non_client_view_->set_client_view(window_delegate_->CreateClientView(this));
   WidgetWin::SetContentsView(non_client_view_);
 
   UpdateWindowTitle();
   UpdateAccessibleRole();
   UpdateAccessibleState();
 
   SetInitialBounds(bounds);
 
   GetMonitorAndRects(bounds.ToRECT(), &last_monitor_, &last_monitor_rect_,
                      &last_work_area_);
   ResetWindowRegion(false);
 }
 
 void WindowWin::SizeWindowToDefault() {
-  app::win::CenterAndSizeWindow(owning_window(), GetNativeView(),
-                                non_client_view_->GetPreferredSize(),
-                                false);
+  ui::CenterAndSizeWindow(owning_window(), GetNativeView(),
+                          non_client_view_->GetPreferredSize(),
+                          false);
 }
 
 gfx::Insets WindowWin::GetClientAreaInsets() const {
   // Returning an empty Insets object causes the default handling in
   // WidgetWin::OnNCCalcSize() to be invoked.
   if (GetNonClientView()->UseNativeFrame())
     return gfx::Insets();
 
   if (IsMaximized()) {
     // Windows automatically adds a standard width border to all sides when a
@@ skipping 945 matching lines @@
   Window::CloseSecondaryWidget(root_view->GetWidget());
   return TRUE;
 }
 }  // namespace
 
 void Window::CloseAllSecondaryWindows() {
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 }
 
 }  // namespace views