summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 02:41:24 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-20 02:41:24 +0000
commit4cf0d9d1cee4b1fa850bbeade738828ab817da07 (patch)
treef6d3500ecc790c882e0454b50d754efd120239a9 /app
parentd462c1abab5865c44036ee3d189fb6fa0717fe3f (diff)
downloadchromium_src-4cf0d9d1cee4b1fa850bbeade738828ab817da07.zip
chromium_src-4cf0d9d1cee4b1fa850bbeade738828ab817da07.tar.gz
chromium_src-4cf0d9d1cee4b1fa850bbeade738828ab817da07.tar.bz2
base/i18n: Add namespace i18n to CharIterator.
BUG=None TEST=None Review URL: http://codereview.chromium.org/6355005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71910 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/text_elider.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/text_elider.cc b/app/text_elider.cc
index c4052aa..77ad958 100644
--- a/app/text_elider.cc
+++ b/app/text_elider.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
@@ -19,7 +19,6 @@
#include "net/base/net_util.h"
#include "net/base/registry_controlled_domain.h"
-
namespace {
const char* kEllipsis = "\xE2\x80\xA6";
@@ -616,7 +615,7 @@ void RectangleString::AddWord(const string16& word) {
// Word is so big that it must be fragmented.
int array_start = 0;
int char_start = 0;
- base::UTF16CharIterator chars(&word);
+ base::i18n::UTF16CharIterator chars(&word);
while (!chars.end()) {
// When boundary is hit, add as much as will fit on this line.
if (current_col_ + (chars.char_pos() - char_start) >= max_cols_) {