| 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_) {
|
|
|