| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/task_manager/task_manager.h" | 5 #include "chrome/browser/task_manager/task_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/i18n/number_formatting.h" | 9 #include "base/i18n/number_formatting.h" |
| 10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 break; | 358 break; |
| 359 } | 359 } |
| 360 } | 360 } |
| 361 | 361 |
| 362 NOTREACHED(); | 362 NOTREACHED(); |
| 363 return -1; | 363 return -1; |
| 364 } | 364 } |
| 365 | 365 |
| 366 int TaskManagerModel::CompareValues(int row1, int row2, int col_id) const { | 366 int TaskManagerModel::CompareValues(int row1, int row2, int col_id) const { |
| 367 CHECK(row1 < ResourceCount() && row2 < ResourceCount()); | 367 CHECK(row1 < ResourceCount() && row2 < ResourceCount()); |
| 368 if (col_id == IDS_TASK_MANAGER_PAGE_COLUMN) { | 368 if (col_id == IDS_TASK_MANAGER_TASK_COLUMN) { |
| 369 // Let's do the default, string compare on the resource title. | 369 // Let's do the default, string compare on the resource title. |
| 370 static icu::Collator* collator = NULL; | 370 static icu::Collator* collator = NULL; |
| 371 if (!collator) { | 371 if (!collator) { |
| 372 UErrorCode create_status = U_ZERO_ERROR; | 372 UErrorCode create_status = U_ZERO_ERROR; |
| 373 collator = icu::Collator::createInstance(create_status); | 373 collator = icu::Collator::createInstance(create_status); |
| 374 if (!U_SUCCESS(create_status)) { | 374 if (!U_SUCCESS(create_status)) { |
| 375 collator = NULL; | 375 collator = NULL; |
| 376 NOTREACHED(); | 376 NOTREACHED(); |
| 377 } | 377 } |
| 378 } | 378 } |
| (...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1161 // Count the number of extensions with background pages (including | 1161 // Count the number of extensions with background pages (including |
| 1162 // incognito). | 1162 // incognito). |
| 1163 count += CountExtensionBackgroundPagesForProfile(profile); | 1163 count += CountExtensionBackgroundPagesForProfile(profile); |
| 1164 if (profile->HasOffTheRecordProfile()) { | 1164 if (profile->HasOffTheRecordProfile()) { |
| 1165 count += CountExtensionBackgroundPagesForProfile( | 1165 count += CountExtensionBackgroundPagesForProfile( |
| 1166 profile->GetOffTheRecordProfile()); | 1166 profile->GetOffTheRecordProfile()); |
| 1167 } | 1167 } |
| 1168 } | 1168 } |
| 1169 return count; | 1169 return count; |
| 1170 } | 1170 } |
| OLD | NEW |