diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
commit | 4f260d0c40e2b63d2af72d667ca5b0518c2dff84 (patch) | |
tree | 2c976dd8b8dc5c217646627205e61728e8891b03 /base/process_util.h | |
parent | b3ae5db129f88dae153880e84bdabea8ce2ca89b (diff) | |
download | chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.zip chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.gz chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.bz2 |
Update file version info/memory details/process utils to use string16.
BUG=23581
TEST=everything still works
Review URL: http://codereview.chromium.org/5968008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util.h')
-rw-r--r-- | base/process_util.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/base/process_util.h b/base/process_util.h index ccbb687..ce4b0bb 100644 --- a/base/process_util.h +++ b/base/process_util.h @@ -34,10 +34,10 @@ typedef struct _malloc_zone_t malloc_zone_t; #include <vector> #include "base/file_descriptor_shuffle.h" +#include "base/file_path.h" #include "base/process.h" class CommandLine; -class FilePath; namespace base { @@ -322,7 +322,7 @@ class ProcessFilter { // Returns the number of processes on the machine that are running from the // given executable name. If filter is non-null, then only processes selected // by the filter will be counted. -int GetProcessCount(const std::wstring& executable_name, +int GetProcessCount(const FilePath::StringType& executable_name, const ProcessFilter* filter); // Attempts to kill all the processes on the current machine that were launched @@ -330,7 +330,7 @@ int GetProcessCount(const std::wstring& executable_name, // filter is non-null, then only processes selected by the filter are killed. // Returns true if all processes were able to be killed off, false if at least // one couldn't be killed. -bool KillProcesses(const std::wstring& executable_name, int exit_code, +bool KillProcesses(const FilePath::StringType& executable_name, int exit_code, const ProcessFilter* filter); // Attempts to kill the process identified by the given process @@ -377,7 +377,7 @@ bool WaitForExitCodeWithTimeout(ProcessHandle handle, int* exit_code, // is non-null, then only processes selected by the filter are waited on. // Returns after all processes have exited or wait_milliseconds have expired. // Returns true if all the processes exited, false otherwise. -bool WaitForProcessesToExit(const std::wstring& executable_name, +bool WaitForProcessesToExit(const FilePath::StringType& executable_name, int64 wait_milliseconds, const ProcessFilter* filter); @@ -396,7 +396,7 @@ bool CrashAwareSleep(ProcessHandle handle, int64 wait_milliseconds); // on. Killed processes are ended with the given exit code. Returns false if // any processes needed to be killed, true if they all exited cleanly within // the wait_milliseconds delay. -bool CleanupProcesses(const std::wstring& executable_name, +bool CleanupProcesses(const FilePath::StringType& executable_name, int64 wait_milliseconds, int exit_code, const ProcessFilter* filter); @@ -457,7 +457,7 @@ class ProcessIterator { // until it returns false. class NamedProcessIterator : public ProcessIterator { public: - NamedProcessIterator(const std::wstring& executable_name, + NamedProcessIterator(const FilePath::StringType& executable_name, const ProcessFilter* filter); virtual ~NamedProcessIterator(); @@ -465,7 +465,7 @@ class NamedProcessIterator : public ProcessIterator { virtual bool IncludeEntry(); private: - std::wstring executable_name_; + FilePath::StringType executable_name_; DISALLOW_COPY_AND_ASSIGN(NamedProcessIterator); }; |