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

Side by Side Diff: chrome/common/child_process_info.cc

Issue 3915002: Out of process Pepper (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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
« no previous file with comments | « chrome/common/child_process_info.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/common/child_process_info.h" 5 #include "chrome/common/child_process_info.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "base/atomicops.h" 10 #include "base/atomicops.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 case ZYGOTE_PROCESS: 57 case ZYGOTE_PROCESS:
58 return "Zygote"; 58 return "Zygote";
59 case SANDBOX_HELPER_PROCESS: 59 case SANDBOX_HELPER_PROCESS:
60 return "Sandbox helper"; 60 return "Sandbox helper";
61 case NACL_LOADER_PROCESS: 61 case NACL_LOADER_PROCESS:
62 return "Native Client module"; 62 return "Native Client module";
63 case NACL_BROKER_PROCESS: 63 case NACL_BROKER_PROCESS:
64 return "Native Client broker"; 64 return "Native Client broker";
65 case GPU_PROCESS: 65 case GPU_PROCESS:
66 return "GPU"; 66 return "GPU";
67 case PPAPI_PLUGIN_PROCESS:
68 return "Pepper Plugin";
67 case UNKNOWN_PROCESS: 69 case UNKNOWN_PROCESS:
68 default: 70 default:
69 DCHECK(false) << "Unknown child process type!"; 71 DCHECK(false) << "Unknown child process type!";
70 return "Unknown"; 72 return "Unknown";
71 } 73 }
72 } 74 }
73 75
74 string16 ChildProcessInfo::GetLocalizedTitle() const { 76 string16 ChildProcessInfo::GetLocalizedTitle() const {
75 string16 title = WideToUTF16Hack(name_); 77 string16 title = WideToUTF16Hack(name_);
76 if (type_ == ChildProcessInfo::PLUGIN_PROCESS && title.empty()) 78 if (type_ == ChildProcessInfo::PLUGIN_PROCESS && title.empty())
(...skipping 12 matching lines...) Expand all
89 case ChildProcessInfo::PROFILE_IMPORT_PROCESS: 91 case ChildProcessInfo::PROFILE_IMPORT_PROCESS:
90 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX); 92 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_UTILITY_PREFIX);
91 93
92 case ChildProcessInfo::GPU_PROCESS: 94 case ChildProcessInfo::GPU_PROCESS:
93 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_GPU_PREFIX); 95 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_GPU_PREFIX);
94 96
95 case ChildProcessInfo::NACL_BROKER_PROCESS: 97 case ChildProcessInfo::NACL_BROKER_PROCESS:
96 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NACL_BROKER_PREFIX); 98 return l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NACL_BROKER_PREFIX);
97 99
98 case ChildProcessInfo::PLUGIN_PROCESS: 100 case ChildProcessInfo::PLUGIN_PROCESS:
101 case ChildProcessInfo::PPAPI_PLUGIN_PROCESS:
99 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PLUGIN_PREFIX, 102 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_PLUGIN_PREFIX,
100 title, 103 title,
101 WideToUTF16Hack(version_)); 104 WideToUTF16Hack(version_));
102 105
103 case ChildProcessInfo::NACL_LOADER_PROCESS: 106 case ChildProcessInfo::NACL_LOADER_PROCESS:
104 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NACL_PREFIX, title); 107 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NACL_PREFIX, title);
105 108
106 case ChildProcessInfo::WORKER_PROCESS: 109 case ChildProcessInfo::WORKER_PROCESS:
107 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_WORKER_PREFIX, title); 110 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_WORKER_PREFIX, title);
108 111
(...skipping 30 matching lines...) Expand all
139 base::GetCurrentProcId(), instance, 142 base::GetCurrentProcId(), instance,
140 base::RandInt(0, std::numeric_limits<int>::max())); 143 base::RandInt(0, std::numeric_limits<int>::max()));
141 } 144 }
142 145
143 // static 146 // static
144 int ChildProcessInfo::GenerateChildProcessUniqueId() { 147 int ChildProcessInfo::GenerateChildProcessUniqueId() {
145 // This function must be threadsafe. 148 // This function must be threadsafe.
146 static base::subtle::Atomic32 last_unique_child_id = 0; 149 static base::subtle::Atomic32 last_unique_child_id = 0;
147 return base::subtle::NoBarrier_AtomicIncrement(&last_unique_child_id, 1); 150 return base::subtle::NoBarrier_AtomicIncrement(&last_unique_child_id, 1);
148 } 151 }
OLDNEW
« no previous file with comments | « chrome/common/child_process_info.h ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698