summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-09 22:15:25 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-09 22:15:25 +0000
commitdbb97ba9f0608c2ebf6f02f750df9c5e433b770e (patch)
tree6da1f4050039906a020366d937107190c86b6776 /printing
parent9045c60ac4a8cbeeb911aadcd771fb4ec020703c (diff)
downloadchromium_src-dbb97ba9f0608c2ebf6f02f750df9c5e433b770e.zip
chromium_src-dbb97ba9f0608c2ebf6f02f750df9c5e433b770e.tar.gz
chromium_src-dbb97ba9f0608c2ebf6f02f750df9c5e433b770e.tar.bz2
Move text_elider to gfx.
R=sky@chromium.org http://crbug.com/103304 Review URL: https://codereview.chromium.org/23731010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/backend/print_backend.cc4
-rw-r--r--printing/print_settings_initializer.cc4
-rw-r--r--printing/printed_document.cc2
3 files changed, 5 insertions, 5 deletions
diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc
index 958343f..29dc1fd 100644
--- a/printing/backend/print_backend.cc
+++ b/printing/backend/print_backend.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "third_party/icu/source/common/unicode/uchar.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/gfx/text_elider.h"
namespace {
@@ -44,7 +44,7 @@ string16 PrintBackend::SimplifyDocumentTitle(const string16& title) {
std::remove_if(no_controls.begin(), no_controls.end(), &u_iscntrl),
no_controls.end());
string16 result;
- ui::ElideString(no_controls, kMaxDocumentTitleLength, &result);
+ gfx::ElideString(no_controls, kMaxDocumentTitleLength, &result);
return result;
}
diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc
index 867f4dc..49a7bd8 100644
--- a/printing/print_settings_initializer.cc
+++ b/printing/print_settings_initializer.cc
@@ -16,8 +16,8 @@
#include "printing/print_job_constants.h"
#include "printing/print_settings.h"
#include "printing/units.h"
-#include "ui/base/text/text_elider.h"
#include "ui/gfx/font.h"
+#include "ui/gfx/text_elider.h"
#include "url/gurl.h"
using base::DictionaryValue;
@@ -44,7 +44,7 @@ void PrintSettingsInitializer::InitHeaderFooterStrings(
print_settings->date = date;
print_settings->title = title;
- print_settings->url = ui::ElideUrl(GURL(url), gfx::Font(), 0, std::string());
+ print_settings->url = gfx::ElideUrl(GURL(url), gfx::Font(), 0, std::string());
}
} // namespace printing
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 59cc385..fa40e1f 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -23,8 +23,8 @@
#include "printing/printed_pages_source.h"
#include "printing/units.h"
#include "skia/ext/platform_device.h"
-#include "ui/base/text/text_elider.h"
#include "ui/gfx/font.h"
+#include "ui/gfx/text_elider.h"
namespace {