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

Unified Diff: chrome/app/mash/mash_runner.cc

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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
« no previous file with comments | « chrome/app/mash/mash_runner.h ('k') | chrome/app_shim/chrome_main_app_mode_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/mash/mash_runner.cc
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index f940c8a72fbe44646830b1cba3f97be071e1dc7a..4dbcb18f86eb16beac2ddc34d74aff323c8a4644 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -83,7 +83,8 @@ class DefaultShellClient : public shell::ShellClient,
private:
// TODO(sky): move this into mash.
- scoped_ptr<shell::ShellClient> CreateShellClient(const std::string& name) {
+ std::unique_ptr<shell::ShellClient> CreateShellClient(
+ const std::string& name) {
if (name == "mojo:ash_sysui")
return base::WrapUnique(new ash::sysui::SysUIApplication);
if (name == "mojo:desktop_wm")
@@ -112,8 +113,8 @@ class DefaultShellClient : public shell::ShellClient,
}
mojo::BindingSet<ShellClientFactory> shell_client_factory_bindings_;
- scoped_ptr<shell::ShellClient> shell_client_;
- scoped_ptr<shell::ShellConnection> shell_connection_;
+ std::unique_ptr<shell::ShellClient> shell_client_;
+ std::unique_ptr<shell::ShellConnection> shell_connection_;
DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
};
@@ -188,7 +189,7 @@ void MashRunner::RunMain() {
// in chrome.
NativeRunnerDelegateImpl native_runner_delegate;
shell::BackgroundShell background_shell;
- scoped_ptr<shell::BackgroundShell::InitParams> init_params(
+ std::unique_ptr<shell::BackgroundShell::InitParams> init_params(
new shell::BackgroundShell::InitParams);
init_params->native_runner_delegate = &native_runner_delegate;
background_shell.Init(std::move(init_params));
@@ -231,7 +232,7 @@ int MashMain() {
true); // Tick count
// TODO(sky): use MessagePumpMojo.
- scoped_ptr<base::MessageLoop> message_loop;
+ std::unique_ptr<base::MessageLoop> message_loop;
#if defined(OS_LINUX)
base::AtExitManager exit_manager;
#endif
« no previous file with comments | « chrome/app/mash/mash_runner.h ('k') | chrome/app_shim/chrome_main_app_mode_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698