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

Side by Side Diff: ui/mojo/init/ui_init.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/message_center/views/toast_contents_view.cc ('k') | ui/native_theme/common_theme.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 UI_MOJO_INIT_UI_INIT_H_ 5 #ifndef UI_MOJO_INIT_UI_INIT_H_
6 #define UI_MOJO_INIT_UI_INIT_H_ 6 #define UI_MOJO_INIT_UI_INIT_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 14
15 namespace gfx { 15 namespace gfx {
16 class Display; 16 class Display;
17 class Screen; 17 class Screen;
18 } 18 }
19 19
20 namespace ui { 20 namespace ui {
21 class GestureConfiguration; 21 class GestureConfiguration;
22 22
23 namespace mojo { 23 namespace mojo {
24 24
25 class GestureConfigurationMojo; 25 class GestureConfigurationMojo;
26 26
27 // UIInit configures any state needed by apps that make use of ui classes (not 27 // UIInit configures any state needed by apps that make use of ui classes (not
28 // including aura). 28 // including aura).
29 class UIInit { 29 class UIInit {
30 public: 30 public:
31 explicit UIInit(const std::vector<gfx::Display>& displays); 31 explicit UIInit(const std::vector<gfx::Display>& displays);
32 ~UIInit(); 32 ~UIInit();
33 33
34 private: 34 private:
35 scoped_ptr<gfx::Screen> screen_; 35 std::unique_ptr<gfx::Screen> screen_;
36 #if defined(OS_ANDROID) 36 #if defined(OS_ANDROID)
37 scoped_ptr<GestureConfigurationMojo> gesture_configuration_; 37 std::unique_ptr<GestureConfigurationMojo> gesture_configuration_;
38 #endif 38 #endif
39 39
40 DISALLOW_COPY_AND_ASSIGN(UIInit); 40 DISALLOW_COPY_AND_ASSIGN(UIInit);
41 }; 41 };
42 42
43 } // namespace mojo 43 } // namespace mojo
44 } // namespace ui 44 } // namespace ui
45 45
46 #endif // UI_MOJO_INIT_UI_INIT_H_ 46 #endif // UI_MOJO_INIT_UI_INIT_H_
OLDNEW
« no previous file with comments | « ui/message_center/views/toast_contents_view.cc ('k') | ui/native_theme/common_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698