| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/child_process_resource_provider.h" | 5 #include "chrome/browser/task_manager/child_process_resource_provider.h" | 
| 6 | 6 | 
| 7 #include <vector> | 7 #include <vector> | 
| 8 | 8 | 
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" | 
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" | 
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 165   } | 165   } | 
| 166 | 166 | 
| 167   // Explicitly mark name as LTR if there is no strong RTL character, | 167   // Explicitly mark name as LTR if there is no strong RTL character, | 
| 168   // to avoid the wrong concatenation result similar to "!Yahoo Mail: the | 168   // to avoid the wrong concatenation result similar to "!Yahoo Mail: the | 
| 169   // best web-based Email: NIGULP", in which "NIGULP" stands for the Hebrew | 169   // best web-based Email: NIGULP", in which "NIGULP" stands for the Hebrew | 
| 170   // or Arabic word for "plugin". | 170   // or Arabic word for "plugin". | 
| 171   base::i18n::AdjustStringForLocaleDirection(&title); | 171   base::i18n::AdjustStringForLocaleDirection(&title); | 
| 172 | 172 | 
| 173   switch (process_type_) { | 173   switch (process_type_) { | 
| 174     case content::PROCESS_TYPE_UTILITY: | 174     case content::PROCESS_TYPE_UTILITY: | 
| 175       return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX); | 175       return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX, title); | 
| 176     case content::PROCESS_TYPE_GPU: | 176     case content::PROCESS_TYPE_GPU: | 
| 177       return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_GPU_PREFIX); | 177       return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_GPU_PREFIX); | 
| 178     case content::PROCESS_TYPE_PLUGIN: | 178     case content::PROCESS_TYPE_PLUGIN: | 
| 179     case content::PROCESS_TYPE_PPAPI_PLUGIN: | 179     case content::PROCESS_TYPE_PPAPI_PLUGIN: | 
| 180       return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PLUGIN_PREFIX, title); | 180       return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PLUGIN_PREFIX, title); | 
| 181     case content::PROCESS_TYPE_PPAPI_BROKER: | 181     case content::PROCESS_TYPE_PPAPI_BROKER: | 
| 182       return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PLUGIN_BROKER_PREFIX, | 182       return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PLUGIN_BROKER_PREFIX, | 
| 183                                         title); | 183                                         title); | 
| 184     case PROCESS_TYPE_NACL_BROKER: | 184     case PROCESS_TYPE_NACL_BROKER: | 
| 185       return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NACL_BROKER_PREFIX); | 185       return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NACL_BROKER_PREFIX); | 
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 327 // This is called on the UI thread. | 327 // This is called on the UI thread. | 
| 328 void ChildProcessResourceProvider::ChildProcessDataRetreived( | 328 void ChildProcessResourceProvider::ChildProcessDataRetreived( | 
| 329     const std::vector<content::ChildProcessData>& child_processes) { | 329     const std::vector<content::ChildProcessData>& child_processes) { | 
| 330   for (size_t i = 0; i < child_processes.size(); ++i) | 330   for (size_t i = 0; i < child_processes.size(); ++i) | 
| 331     AddToTaskManager(child_processes[i]); | 331     AddToTaskManager(child_processes[i]); | 
| 332 | 332 | 
| 333   task_manager_->model()->NotifyDataReady(); | 333   task_manager_->model()->NotifyDataReady(); | 
| 334 } | 334 } | 
| 335 | 335 | 
| 336 }  // namespace task_manager | 336 }  // namespace task_manager | 
| OLD | NEW | 
|---|