diff options
Diffstat (limited to 'app/gfx')
-rw-r--r-- | app/gfx/text_elider.cc | 2 | ||||
-rw-r--r-- | app/gfx/text_elider.h | 2 | ||||
-rw-r--r-- | app/gfx/text_elider_unittest.cc | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/gfx/text_elider.cc b/app/gfx/text_elider.cc index 72ee61d..7f56fac 100644 --- a/app/gfx/text_elider.cc +++ b/app/gfx/text_elider.cc @@ -337,7 +337,7 @@ SortedDisplayURL::SortedDisplayURL(const GURL& url, } int SortedDisplayURL::Compare(const SortedDisplayURL& other, - Collator* collator) const { + icu::Collator* collator) const { // Compare on hosts first. The host won't contain 'www.'. UErrorCode compare_status = U_ZERO_ERROR; UCollationResult host_compare_result = collator->compare( diff --git a/app/gfx/text_elider.h b/app/gfx/text_elider.h index 96afdfb..4c9c1fa 100644 --- a/app/gfx/text_elider.h +++ b/app/gfx/text_elider.h @@ -60,7 +60,7 @@ class SortedDisplayURL { // Compares this SortedDisplayURL to |url| using |collator|. Returns a value // < 0, = 1 or > 0 as to whether this url is less then, equal to or greater // than the supplied url. - int Compare(const SortedDisplayURL& other, Collator* collator) const; + int Compare(const SortedDisplayURL& other, icu::Collator* collator) const; // Returns the display string for the URL. const string16& display_url() const { return display_url_; } diff --git a/app/gfx/text_elider_unittest.cc b/app/gfx/text_elider_unittest.cc index 03e0bad..bf07428 100644 --- a/app/gfx/text_elider_unittest.cc +++ b/app/gfx/text_elider_unittest.cc @@ -234,7 +234,8 @@ TEST(TextEliderTest, SortedDisplayURL) { // Verifies DisplayURL::Compare works correctly. TEST(TextEliderTest, SortedDisplayURLCompare) { UErrorCode create_status = U_ZERO_ERROR; - scoped_ptr<Collator> collator(Collator::createInstance(create_status)); + scoped_ptr<icu::Collator> collator( + icu::Collator::createInstance(create_status)); if (!U_SUCCESS(create_status)) return; |