Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(759)

Unified Diff: app/text_elider.cc

Issue 6355005: base/i18n: Add namespace i18n to CharIterator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unittests Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/i18n/char_iterator.h » ('j') | base/i18n/char_iterator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/text_elider.cc
diff --git a/app/text_elider.cc b/app/text_elider.cc
index c4052aa0f18847d29957a6746d78af7044d72f55..77ad9589f38b54f4aef4f680625f843813edbf7d 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_) {
« no previous file with comments | « no previous file | base/i18n/char_iterator.h » ('j') | base/i18n/char_iterator.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698