diff options
author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 17:24:27 +0000 |
---|---|---|
committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 17:24:27 +0000 |
commit | ec91bfa9eecec28bad96bcde2d30244b10f0d421 (patch) | |
tree | cb6b38040a05d9f12af65e94deecefa036667b4e /printing/backend | |
parent | 014a62cbb9d6e9013c038b1e3c46ea764799be13 (diff) | |
download | chromium_src-ec91bfa9eecec28bad96bcde2d30244b10f0d421.zip chromium_src-ec91bfa9eecec28bad96bcde2d30244b10f0d421.tar.gz chromium_src-ec91bfa9eecec28bad96bcde2d30244b10f0d421.tar.bz2 |
Moved SimplifyDocumentTitle from printing/backend
TBR=noamsml
Review URL: https://codereview.chromium.org/59903019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/backend')
-rw-r--r-- | printing/backend/print_backend.cc | 18 | ||||
-rw-r--r-- | printing/backend/print_backend.h | 4 | ||||
-rw-r--r-- | printing/backend/print_backend_unittest.cc | 26 |
3 files changed, 0 insertions, 48 deletions
diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc index b7eb5a1..29d38fb 100644 --- a/printing/backend/print_backend.cc +++ b/printing/backend/print_backend.cc @@ -4,13 +4,6 @@ #include "printing/backend/print_backend.h" -#include <algorithm> - -#include "third_party/icu/source/common/unicode/uchar.h" -#include "ui/gfx/text_elider.h" - -const int kMaxDocumentTitleLength = 50; - namespace printing { PrinterBasicInfo::PrinterBasicInfo() @@ -33,15 +26,4 @@ PrinterCapsAndDefaults::~PrinterCapsAndDefaults() {} PrintBackend::~PrintBackend() {} -base::string16 PrintBackend::SimplifyDocumentTitle( - const base::string16& title) { - base::string16 no_controls(title); - no_controls.erase( - std::remove_if(no_controls.begin(), no_controls.end(), &u_iscntrl), - no_controls.end()); - base::string16 result; - gfx::ElideString(no_controls, kMaxDocumentTitleLength, &result); - return result; -} - } // namespace printing diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h index 1d058bf..d698d11 100644 --- a/printing/backend/print_backend.h +++ b/printing/backend/print_backend.h @@ -10,7 +10,6 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "base/strings/string16.h" #include "printing/print_job_constants.h" #include "printing/printing_export.h" @@ -98,9 +97,6 @@ class PRINTING_EXPORT PrintBackend // Returns true if printer_name points to a valid printer. virtual bool IsValidPrinter(const std::string& printer_name) = 0; - // Simplify title to resolve issue with some drivers. - static base::string16 SimplifyDocumentTitle(const base::string16& title); - // Allocate a print backend. If |print_backend_settings| is NULL, default // settings will be used. // Return NULL if no print backend available. diff --git a/printing/backend/print_backend_unittest.cc b/printing/backend/print_backend_unittest.cc deleted file mode 100644 index 356a346..0000000 --- a/printing/backend/print_backend_unittest.cc +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2012 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 "base/strings/utf_string_conversions.h" -#include "printing/backend/print_backend.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace printing { - -std::string Simplify(const char* title) { - return UTF16ToUTF8(PrintBackend::SimplifyDocumentTitle(ASCIIToUTF16(title))); -} - -TEST(PrintBackendTest, SimplifyDocumentTitle) { - EXPECT_STREQ("", Simplify("").c_str()); - EXPECT_STREQ("Long string. Long string...ng string. Long string.", - Simplify("Long string. Long string. Long string. Long string. " - "Long string. Long string. Long string.").c_str()); - EXPECT_STREQ("Control Characters", - Simplify("C\ron\ntrol Charac\15ters").c_str()); - EXPECT_STREQ("", Simplify("\n\r\n\r\t\r").c_str()); -} - -} // namespace printing - |