From 9dd7e3d78c14f67c5c3d78868a3a63bbc4f90634 Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
 <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 20 Jan 2011 18:27:06 +0000
Subject: Move a bunch of random other files to src/ui/base

BUG=none
TEST=none
TBR=brettw

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71970 0039d316-1c4b-4281-b951-d872f2087c98
---
 printing/DEPS                | 2 +-
 printing/page_overlays.cc    | 3 +--
 printing/printed_document.cc | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'printing')

diff --git a/printing/DEPS b/printing/DEPS
index cfb3f60..1144038 100644
--- a/printing/DEPS
+++ b/printing/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
-  "+app/gfx",  # Font's are here.
   "+app",  # win_util::FormatSystemTime/Date.
   "+base",
   "+gfx",
   "+skia/ext",
+  "+ui/base/text",
 ]
diff --git a/printing/page_overlays.cc b/printing/page_overlays.cc
index eb0c2a6..f6a7c28 100644
--- a/printing/page_overlays.cc
+++ b/printing/page_overlays.cc
@@ -4,7 +4,6 @@
 
 #include "printing/page_overlays.h"
 
-#include "app/text_elider.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ -192,7 +191,7 @@ std::wstring PageOverlays::ReplaceVariables(const std::wstring& input,
     } else if (0 == output.compare(offset,
                                    wcslen(kUrl),
                                    kUrl)) {
-      // TODO(maruel):  http://b/1126373 gfx::ElideUrl(document.url(), ...)
+      // TODO(maruel):  http://b/1126373 ui::ElideUrl(document.url(), ...)
       offset = ReplaceKey(&output,
                           offset,
                           wcslen(kUrl),
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 5993b3d..f50bf83 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -9,7 +9,6 @@
 #include <string>
 #include <vector>
 
-#include "app/text_elider.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
@@ -25,6 +24,7 @@
 #include "printing/printed_page.h"
 #include "printing/units.h"
 #include "skia/ext/platform_device.h"
+#include "ui/base/text/text_elider.h"
 
 namespace {
 
@@ -225,10 +225,10 @@ void PrintedDocument::PrintHeaderFooter(gfx::NativeDrawingContext context,
 
   if (string_size.width() > bounding.width()) {
     if (line == PageOverlays::kUrl) {
-      output = UTF16ToWideHack(gfx::ElideUrl(url(), font, bounding.width(),
-                                             std::wstring()));
+      output = UTF16ToWideHack(ui::ElideUrl(url(), font, bounding.width(),
+                                            std::wstring()));
     } else {
-      output = UTF16ToWideHack(gfx::ElideText(WideToUTF16Hack(output),
+      output = UTF16ToWideHack(ui::ElideText(WideToUTF16Hack(output),
           font, bounding.width(), false));
     }
   }
-- 
cgit v1.1