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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « ash/shell/window_watcher.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_INIT_PARAMS_H_ 5 #ifndef ASH_SHELL_INIT_PARAMS_H_
6 #define ASH_SHELL_INIT_PARAMS_H_ 6 #define ASH_SHELL_INIT_PARAMS_H_
7 7
8 #include <memory>
9
8 #include "build/build_config.h" 10 #include "build/build_config.h"
9 11
10 #if defined(OS_WIN) 12 #if defined(OS_WIN)
11 #include <windows.h> 13 #include <windows.h>
12 #endif 14 #endif
13 15
14 #include "ash/ash_export.h" 16 #include "ash/ash_export.h"
15 #include "base/callback.h" 17 #include "base/callback.h"
16 #include "base/memory/scoped_ptr.h"
17 18
18 namespace base { 19 namespace base {
19 class SequencedWorkerPool; 20 class SequencedWorkerPool;
20 } 21 }
21 22
22 namespace ui { 23 namespace ui {
23 class ContextFactory; 24 class ContextFactory;
24 } 25 }
25 26
26 namespace ash { 27 namespace ash {
27 28
28 class KeyboardUI; 29 class KeyboardUI;
29 class ShellDelegate; 30 class ShellDelegate;
30 31
31 struct ASH_EXPORT ShellInitParams { 32 struct ASH_EXPORT ShellInitParams {
32 ShellInitParams(); 33 ShellInitParams();
33 ~ShellInitParams(); 34 ~ShellInitParams();
34 35
35 ShellDelegate* delegate; 36 ShellDelegate* delegate;
36 37
37 ui::ContextFactory* context_factory; 38 ui::ContextFactory* context_factory;
38 base::SequencedWorkerPool* blocking_pool; 39 base::SequencedWorkerPool* blocking_pool;
39 40
40 // True if running inside mus. 41 // True if running inside mus.
41 bool in_mus = false; 42 bool in_mus = false;
42 43
43 base::Callback<scoped_ptr<KeyboardUI>()> keyboard_factory; 44 base::Callback<std::unique_ptr<KeyboardUI>()> keyboard_factory;
44 45
45 #if defined(OS_WIN) 46 #if defined(OS_WIN)
46 HWND remote_hwnd; 47 HWND remote_hwnd;
47 #endif 48 #endif
48 }; 49 };
49 50
50 } // namespace ash 51 } // namespace ash
51 52
52 #endif // ASH_SHELL_INIT_PARAMS_H_ 53 #endif // ASH_SHELL_INIT_PARAMS_H_
OLDNEW
« 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