Move a bunch of random other files to src/ui/base...

views/window/window.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.h"
 
-#include "app/gfx/font_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "gfx/font.h"
 #include "gfx/size.h"
+#include "ui/base/l10n/l10n_font_util.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // static
 int Window::GetLocalizedContentsWidth(int col_resource_id) {
-  return gfx::GetLocalizedContentsWidthForFont(col_resource_id,
+  return ui::GetLocalizedContentsWidthForFont(col_resource_id,
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
 }
 
 // static
 int Window::GetLocalizedContentsHeight(int row_resource_id) {
-  return gfx::GetLocalizedContentsHeightForFont(row_resource_id,
+  return ui::GetLocalizedContentsHeightForFont(row_resource_id,
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
 }
 
 // static
 gfx::Size Window::GetLocalizedContentsSize(int col_resource_id,
                                            int row_resource_id) {
   return gfx::Size(GetLocalizedContentsWidth(col_resource_id),
                    GetLocalizedContentsHeight(row_resource_id));
 }
 
 // static
 void Window::CloseSecondaryWidget(Widget* widget) {
   if (!widget)
     return;
 
   // Close widget if it's identified as a secondary window.
   Window* window = widget->GetWindow();
   if (window) {
     if (!window->IsAppWindow())
       window->Close();
   } else {
     // If it's not a Window, then close it anyway since it probably is
     // secondary.
     widget->Close();
   }
 }
 
 }  // namespace views