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

Unified Diff: services/shell/runner/host/out_of_process_native_runner.h

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/shell/runner/host/out_of_process_native_runner.h
diff --git a/services/shell/runner/host/out_of_process_native_runner.h b/services/shell/runner/host/out_of_process_native_runner.h
index b4754e6c7067ced56cc303ce6ea972fb4938a521..d141c90e0c361abdce6ddd02c38c5ea0ea814ae1 100644
--- a/services/shell/runner/host/out_of_process_native_runner.h
+++ b/services/shell/runner/host/out_of_process_native_runner.h
@@ -7,19 +7,18 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "services/shell/native_runner.h"
namespace base {
class TaskRunner;
}
-namespace mojo {
namespace shell {
class ChildProcessHost;
@@ -50,7 +49,7 @@ class OutOfProcessNativeRunner : public NativeRunner {
base::FilePath app_path_;
base::Closure app_completed_callback_;
- scoped_ptr<ChildProcessHost> child_process_host_;
+ std::unique_ptr<ChildProcessHost> child_process_host_;
DISALLOW_COPY_AND_ASSIGN(OutOfProcessNativeRunner);
};
@@ -61,7 +60,7 @@ class OutOfProcessNativeRunnerFactory : public NativeRunnerFactory {
NativeRunnerDelegate* delegate);
~OutOfProcessNativeRunnerFactory() override;
- scoped_ptr<NativeRunner> Create(const base::FilePath& app_path) override;
+ std::unique_ptr<NativeRunner> Create(const base::FilePath& app_path) override;
private:
base::TaskRunner* const launch_process_runner_;
@@ -71,6 +70,5 @@ class OutOfProcessNativeRunnerFactory : public NativeRunnerFactory {
};
} // namespace shell
-} // namespace mojo
#endif // SERVICES_SHELL_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
« no previous file with comments | « services/shell/runner/host/native_application_support.cc ('k') | services/shell/runner/host/out_of_process_native_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698