| Index: content/common/child_process_info.h
|
| ===================================================================
|
| --- content/common/child_process_info.h (revision 112315)
|
| +++ content/common/child_process_info.h (working copy)
|
| @@ -11,38 +11,18 @@
|
| #include "base/process.h"
|
| #include "base/string16.h"
|
| #include "content/common/content_export.h"
|
| +#include "content/public/common/process_type.h"
|
|
|
| // Holds information about a child process.
|
| class CONTENT_EXPORT ChildProcessInfo {
|
| public:
|
| - // NOTE: Do not remove or reorder the elements in this enum, and only add new
|
| - // items at the end, right before MAX_PROCESS. We depend on these specific
|
| - // values in histograms.
|
| - enum ProcessType {
|
| - UNKNOWN_PROCESS = 1,
|
| - BROWSER_PROCESS,
|
| - RENDER_PROCESS,
|
| - PLUGIN_PROCESS,
|
| - WORKER_PROCESS,
|
| - NACL_LOADER_PROCESS,
|
| - UTILITY_PROCESS,
|
| - PROFILE_IMPORT_PROCESS,
|
| - ZYGOTE_PROCESS,
|
| - SANDBOX_HELPER_PROCESS,
|
| - NACL_BROKER_PROCESS,
|
| - GPU_PROCESS,
|
| - PPAPI_PLUGIN_PROCESS,
|
| - PPAPI_BROKER_PROCESS,
|
| - MAX_PROCESS
|
| - };
|
| -
|
| ChildProcessInfo(const ChildProcessInfo& original);
|
| virtual ~ChildProcessInfo();
|
|
|
| ChildProcessInfo& operator=(const ChildProcessInfo& original);
|
|
|
| // Returns the type of the process.
|
| - ProcessType type() const { return type_; }
|
| + content::ProcessType type() const { return type_; }
|
|
|
| // Returns the name of the process. i.e. for plugins it might be Flash, while
|
| // for workers it might be the domain that it's from.
|
| @@ -67,7 +47,7 @@
|
|
|
| // Returns an English name of the process type, should only be used for non
|
| // user-visible strings, or debugging pages like about:memory.
|
| - static std::string GetTypeNameInEnglish(ProcessType type);
|
| + static std::string GetTypeNameInEnglish(content::ProcessType type);
|
|
|
| // We define the < operator so that the ChildProcessInfo can be used as a key
|
| // in a std::map.
|
| @@ -99,15 +79,15 @@
|
| // If the caller has already generated a unique ID for this child process,
|
| // it should pass it as the second argument. Otherwise, -1 should be passed
|
| // and a unique ID will be automatically generated.
|
| - ChildProcessInfo(ProcessType type, int id);
|
| + ChildProcessInfo(content::ProcessType type, int id);
|
|
|
| - void set_type(ProcessType type) { type_ = type; }
|
| + void set_type(content::ProcessType type) { type_ = type; }
|
| void set_name(const string16& name) { name_ = name; }
|
| void set_version(const string16& ver) { version_ = ver; }
|
| void set_handle(base::ProcessHandle handle) { process_.set_handle(handle); }
|
|
|
| private:
|
| - ProcessType type_;
|
| + content::ProcessType type_;
|
| string16 name_;
|
| string16 version_;
|
| int id_;
|
|
|