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

chrome/browser/remoting/setup_flow.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/remoting/setup_flow.h"
 
-#include "app/gfx/font_util.h"
 #include "app/l10n_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/remoting/remoting_resources_source.h"
 #include "chrome/browser/remoting/setup_flow_login_step.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/font.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "ui/base/l10n/l10n_font_util.h"
 
 namespace remoting {
 
 static const wchar_t kDoneIframeXPath[] = L"//iframe[@id='done']";
 static const wchar_t kErrorIframeXPath[] = L"//iframe[@id='error']";
 
 SetupFlowStep::SetupFlowStep() { }
 SetupFlowStep::~SetupFlowStep() { }
 
 SetupFlowStepBase::SetupFlowStepBase()
@@ skipping 126 matching lines @@
   handlers->push_back(const_cast<SetupFlow*>(this));
 }
 
 void SetupFlow::GetDialogSize(gfx::Size* size) const {
   PrefService* prefs = profile_->GetPrefs();
   gfx::Font approximate_web_font(
       UTF8ToUTF16(prefs->GetString(prefs::kWebKitSansSerifFontFamily)),
       prefs->GetInteger(prefs::kWebKitDefaultFontSize));
 
   // TODO(pranavk) Replace the following SYNC resources with REMOTING Resources.
-  *size = gfx::GetLocalizedContentsSizeForFont(
+  *size = ui::GetLocalizedContentsSizeForFont(
       IDS_SYNC_SETUP_WIZARD_WIDTH_CHARS,
       IDS_SYNC_SETUP_WIZARD_HEIGHT_LINES,
       approximate_web_font);
 }
 
 // A callback to notify the delegate that the dialog closed.
 void SetupFlow::OnDialogClosed(const std::string& json_retval) {
   if (current_step_ != NULL)
     current_step_->Cancel();
 }
@@ skipping 76 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         new DeleteTask<SetupFlowStep>(current_step_.release()));
   }
 
   current_step_.reset(next_step);
   StartCurrentStep();
 }
 
 }  // namespace remoting