Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Side by Side Diff: chrome/browser/task_manager/task_manager_resource_providers.cc

Issue 7583016: wstring: remove wstrings from ChildProcessInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_resource_providers.h" 5 #include "chrome/browser/task_manager/task_manager_resource_providers.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/file_version_info.h" 8 #include "base/file_version_info.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/process_util.h" 10 #include "base/process_util.h"
(...skipping 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 765
766 bool TaskManagerChildProcessResource::SupportNetworkUsage() const { 766 bool TaskManagerChildProcessResource::SupportNetworkUsage() const {
767 return network_usage_support_; 767 return network_usage_support_;
768 } 768 }
769 769
770 void TaskManagerChildProcessResource::SetSupportNetworkUsage() { 770 void TaskManagerChildProcessResource::SetSupportNetworkUsage() {
771 network_usage_support_ = true; 771 network_usage_support_ = true;
772 } 772 }
773 773
774 string16 TaskManagerChildProcessResource::GetLocalizedTitle() const { 774 string16 TaskManagerChildProcessResource::GetLocalizedTitle() const {
775 string16 title = WideToUTF16Hack(child_process_.name()); 775 string16 title = child_process_.name();
776 if (child_process_.type() == ChildProcessInfo::PLUGIN_PROCESS && 776 if (child_process_.type() == ChildProcessInfo::PLUGIN_PROCESS &&
777 title.empty()) { 777 title.empty()) {
778 title = l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UNKNOWN_PLUGIN_NAME); 778 title = l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UNKNOWN_PLUGIN_NAME);
779 } 779 }
780 780
781 // Explicitly mark name as LTR if there is no strong RTL character, 781 // Explicitly mark name as LTR if there is no strong RTL character,
782 // to avoid the wrong concatenation result similar to "!Yahoo! Mail: the 782 // to avoid the wrong concatenation result similar to "!Yahoo Mail: the
783 // best web-based Email: NIGULP", in which "NIGULP" stands for the Hebrew 783 // best web-based Email: NIGULP", in which "NIGULP" stands for the Hebrew
784 // or Arabic word for "plugin". 784 // or Arabic word for "plugin".
785 base::i18n::AdjustStringForLocaleDirection(&title); 785 base::i18n::AdjustStringForLocaleDirection(&title);
786 786
787 switch (child_process_.type()) { 787 switch (child_process_.type()) {
788 case ChildProcessInfo::UTILITY_PROCESS: 788 case ChildProcessInfo::UTILITY_PROCESS:
789 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX); 789 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX);
790 790
791 case ChildProcessInfo::PROFILE_IMPORT_PROCESS: 791 case ChildProcessInfo::PROFILE_IMPORT_PROCESS:
792 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX); 792 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX);
793 793
794 case ChildProcessInfo::GPU_PROCESS: 794 case ChildProcessInfo::GPU_PROCESS:
795 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_GPU_PREFIX); 795 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_GPU_PREFIX);
796 796
797 case ChildProcessInfo::NACL_BROKER_PROCESS: 797 case ChildProcessInfo::NACL_BROKER_PROCESS:
798 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NACL_BROKER_PREFIX); 798 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NACL_BROKER_PREFIX);
799 799
800 case ChildProcessInfo::PLUGIN_PROCESS: 800 case ChildProcessInfo::PLUGIN_PROCESS:
801 case ChildProcessInfo::PPAPI_PLUGIN_PROCESS: 801 case ChildProcessInfo::PPAPI_PLUGIN_PROCESS:
802 case ChildProcessInfo::PPAPI_BROKER_PROCESS: { 802 case ChildProcessInfo::PPAPI_BROKER_PROCESS: {
803 return l10n_util::GetStringFUTF16( 803 return l10n_util::GetStringFUTF16(
804 IDS_TASK_MANAGER_PLUGIN_PREFIX, title, 804 IDS_TASK_MANAGER_PLUGIN_PREFIX, title, child_process_.version());
805 WideToUTF16Hack(child_process_.version()));
806 } 805 }
807 806
808 case ChildProcessInfo::NACL_LOADER_PROCESS: 807 case ChildProcessInfo::NACL_LOADER_PROCESS:
809 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NACL_PREFIX, title); 808 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NACL_PREFIX, title);
810 809
811 case ChildProcessInfo::WORKER_PROCESS: 810 case ChildProcessInfo::WORKER_PROCESS:
812 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_WORKER_PREFIX, title); 811 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_WORKER_PREFIX, title);
813 812
814 // These types don't need display names or get them from elsewhere. 813 // These types don't need display names or get them from elsewhere.
815 case ChildProcessInfo::BROWSER_PROCESS: 814 case ChildProcessInfo::BROWSER_PROCESS:
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
1314 1313
1315 return &resource_; 1314 return &resource_;
1316 } 1315 }
1317 1316
1318 void TaskManagerBrowserProcessResourceProvider::StartUpdating() { 1317 void TaskManagerBrowserProcessResourceProvider::StartUpdating() {
1319 task_manager_->AddResource(&resource_); 1318 task_manager_->AddResource(&resource_);
1320 } 1319 }
1321 1320
1322 void TaskManagerBrowserProcessResourceProvider::StopUpdating() { 1321 void TaskManagerBrowserProcessResourceProvider::StopUpdating() {
1323 } 1322 }
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | chrome/service/service_utility_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698