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

Unified Diff: services/shell/runner/host/in_process_native_runner.cc

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/in_process_native_runner.cc
diff --git a/services/shell/runner/host/in_process_native_runner.cc b/services/shell/runner/host/in_process_native_runner.cc
index 629d44d5b543cafe0de513193f97b4f29757ca6a..5107a2e6940995cc1670062ee98d198e3fa3de63 100644
--- a/services/shell/runner/host/in_process_native_runner.cc
+++ b/services/shell/runner/host/in_process_native_runner.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/location.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task_runner.h"
#include "base/thread_task_runner_handle.h"
@@ -18,7 +19,6 @@
#include "services/shell/runner/host/out_of_process_native_runner.h"
#include "services/shell/runner/init.h"
-namespace mojo {
namespace shell {
InProcessNativeRunner::InProcessNativeRunner() : app_library_(nullptr) {}
@@ -81,15 +81,14 @@ void InProcessNativeRunner::Run() {
app_completed_callback_runner_.Reset();
}
-scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create(
+std::unique_ptr<NativeRunner> InProcessNativeRunnerFactory::Create(
const base::FilePath& app_path) {
// Non-Mojo apps are always run in a new process.
if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".mojo"))) {
- return make_scoped_ptr(
+ return base::WrapUnique(
new OutOfProcessNativeRunner(launch_process_runner_, nullptr));
}
- return make_scoped_ptr(new InProcessNativeRunner);
+ return base::WrapUnique(new InProcessNativeRunner);
}
} // namespace shell
-} // namespace mojo
« no previous file with comments | « services/shell/runner/host/in_process_native_runner.h ('k') | services/shell/runner/host/in_process_native_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698