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

Unified Diff: services/native_support/process_controller_impl.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: services/native_support/process_controller_impl.cc
diff --git a/services/native_support/process_controller_impl.cc b/services/native_support/process_controller_impl.cc
index d4a9919417ec63cdf9b44f9ea31c4932b57686c7..3f5f4bac76ba69510d977fe1c66ecbcbfd8c3195 100644
--- a/services/native_support/process_controller_impl.cc
+++ b/services/native_support/process_controller_impl.cc
@@ -30,8 +30,8 @@ void WaitForProcess(
const base::Callback<void(mojo::files::Error, int32_t)>& done_callback) {
int exit_status = 0;
mojo::files::Error result = process.WaitForExit(&exit_status)
- ? mojo::files::ERROR_OK
- : mojo::files::ERROR_UNKNOWN;
+ ? mojo::files::Error::OK
+ : mojo::files::Error::UNKNOWN;
done_runner->PostTask(
FROM_HERE,
base::Bind(done_callback, result, static_cast<int32_t>(exit_status)));
@@ -67,7 +67,7 @@ ProcessControllerImpl::~ProcessControllerImpl() {
void ProcessControllerImpl::Wait(const WaitCallback& callback) {
if (!process_.IsValid()) {
// TODO(vtl): This isn't quite right.
- callback.Run(mojo::files::ERROR_UNAVAILABLE, 0);
+ callback.Run(mojo::files::Error::UNAVAILABLE, 0);
return;
}
@@ -90,13 +90,13 @@ void ProcessControllerImpl::OnWaitComplete(const WaitCallback& callback,
mojo::files::Error ProcessControllerImpl::KillHelper(int32_t signal) {
if (signal < 0)
- return mojo::files::ERROR_INVALID_ARGUMENT;
+ return mojo::files::Error::INVALID_ARGUMENT;
if (!process_.IsValid()) {
LOG(ERROR) << "Kill() called after Wait()";
// TODO(vtl): This error code isn't quite right, but "unavailable" (which
// would also be wrong) is used for a more appropriate purpose below.
- return mojo::files::ERROR_INVALID_ARGUMENT;
+ return mojo::files::Error::INVALID_ARGUMENT;
}
// |base::HandleType| is just a typedef for |pid_t|.
@@ -104,19 +104,19 @@ mojo::files::Error ProcessControllerImpl::KillHelper(int32_t signal) {
// Note: |kill()| is not interruptible.
if (kill(pid, static_cast<int>(signal)) == 0)
- return mojo::files::ERROR_OK;
+ return mojo::files::Error::OK;
switch (errno) {
case EINVAL:
- return mojo::files::ERROR_INVALID_ARGUMENT;
+ return mojo::files::Error::INVALID_ARGUMENT;
case EPERM:
- return mojo::files::ERROR_PERMISSION_DENIED;
+ return mojo::files::Error::PERMISSION_DENIED;
case ESRCH:
- return mojo::files::ERROR_UNAVAILABLE;
+ return mojo::files::Error::UNAVAILABLE;
default:
break;
}
- return mojo::files::ERROR_UNKNOWN;
+ return mojo::files::Error::UNKNOWN;
}
} // namespace native_support
« no previous file with comments | « services/keyboard_native/view_observer_delegate.cc ('k') | services/native_support/process_controller_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698