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

Side by Side Diff: ui/ozone/platform_object_internal.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/ozone/platform_object.h ('k') | ui/ozone/public/client_native_pixmap_factory.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 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 UI_OZONE_PLATFORM_OBJECT_INTERNAL_H_ 5 #ifndef UI_OZONE_PLATFORM_OBJECT_INTERNAL_H_
6 #define UI_OZONE_PLATFORM_OBJECT_INTERNAL_H_ 6 #define UI_OZONE_PLATFORM_OBJECT_INTERNAL_H_
7 7
8 #include "base/memory/ptr_util.h"
8 #include "ui/ozone/ozone_export.h" 9 #include "ui/ozone/ozone_export.h"
9 #include "ui/ozone/platform_constructor_list.h" 10 #include "ui/ozone/platform_constructor_list.h"
10 #include "ui/ozone/platform_object.h" 11 #include "ui/ozone/platform_object.h"
11 #include "ui/ozone/platform_selection.h" 12 #include "ui/ozone/platform_selection.h"
12 13
13 namespace ui { 14 namespace ui {
14 15
15 template <class T> 16 template <class T>
16 scoped_ptr<T> PlatformObject<T>::Create() { 17 std::unique_ptr<T> PlatformObject<T>::Create() {
17 typedef typename PlatformConstructorList<T>::Constructor Constructor; 18 typedef typename PlatformConstructorList<T>::Constructor Constructor;
18 19
19 // Determine selected platform (from --ozone-platform flag, or default). 20 // Determine selected platform (from --ozone-platform flag, or default).
20 int platform = GetOzonePlatformId(); 21 int platform = GetOzonePlatformId();
21 22
22 // Look up the constructor in the constructor list. 23 // Look up the constructor in the constructor list.
23 Constructor constructor = PlatformConstructorList<T>::kConstructors[platform]; 24 Constructor constructor = PlatformConstructorList<T>::kConstructors[platform];
24 25
25 // Call the constructor. 26 // Call the constructor.
26 return make_scoped_ptr(constructor()); 27 return base::WrapUnique(constructor());
27 } 28 }
28 29
29 } // namespace ui 30 } // namespace ui
30 31
31 #endif // UI_OZONE_PLATFORM_OBJECT_INTERNAL_H_ 32 #endif // UI_OZONE_PLATFORM_OBJECT_INTERNAL_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform_object.h ('k') | ui/ozone/public/client_native_pixmap_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698