diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 05:12:29 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 05:12:29 +0000 |
| commit | b5b2385af64eb08b1feb53fb0ad65c835f472912 (patch) | |
| tree | 6af57cd4a4965cebe2107e07ca8e563444c3afe9 /chrome/browser/task_manager.cc | |
| parent | 80d6524d33061e0e4f7b06dd87ee94de3e05c7a8 (diff) | |
| download | chromium_src-b5b2385af64eb08b1feb53fb0ad65c835f472912.zip chromium_src-b5b2385af64eb08b1feb53fb0ad65c835f472912.tar.gz chromium_src-b5b2385af64eb08b1feb53fb0ad65c835f472912.tar.bz2 | |
Use 'icu::' namespace explicitly throughout Chrome tree instead of relying on 'using namespace icu'.
This is Chrome's counterpart to the ICU header change that disables
'using namespace icu' (http://codereview.chromium.org/171010/show), which is required to avoid the name colission between Chrome's StringPiece (in base) and ICU's StringPiece.
The webkit change (which is minor) will be dealt with in the webkit bugzilla.
This can go in before the ICU change/upgrade without affecting anything.
BUG=8198
TEST=All the targets are built without an error on all platforms.
Review URL: http://codereview.chromium.org/171012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager.cc')
| -rw-r--r-- | chrome/browser/task_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index b7de95e..62c00dc 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -202,10 +202,10 @@ int TaskManagerModel::CompareValues(int row1, int row2, int col_id) const { switch (col_id) { case IDS_TASK_MANAGER_PAGE_COLUMN: { // Let's do the default, string compare on the resource title. - static Collator* collator = NULL; + static icu::Collator* collator = NULL; if (!collator) { UErrorCode create_status = U_ZERO_ERROR; - collator = Collator::createInstance(create_status); + collator = icu::Collator::createInstance(create_status); if (!U_SUCCESS(create_status)) { collator = NULL; NOTREACHED(); |