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

Unified Diff: ash/shell_init_params.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/shell/window_watcher.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_init_params.h
diff --git a/ash/shell_init_params.h b/ash/shell_init_params.h
index 68999e4d1f25b62cbfdd8dd91b634557eb0ca1d2..edca1f4d96e2e4756047c4b1720ce1bb7377194f 100644
--- a/ash/shell_init_params.h
+++ b/ash/shell_init_params.h
@@ -5,6 +5,8 @@
#ifndef ASH_SHELL_INIT_PARAMS_H_
#define ASH_SHELL_INIT_PARAMS_H_
+#include <memory>
+
#include "build/build_config.h"
#if defined(OS_WIN)
@@ -13,7 +15,6 @@
#include "ash/ash_export.h"
#include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
namespace base {
class SequencedWorkerPool;
@@ -40,7 +41,7 @@ struct ASH_EXPORT ShellInitParams {
// True if running inside mus.
bool in_mus = false;
- base::Callback<scoped_ptr<KeyboardUI>()> keyboard_factory;
+ base::Callback<std::unique_ptr<KeyboardUI>()> keyboard_factory;
#if defined(OS_WIN)
HWND remote_hwnd;
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698