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

Side by Side Diff: ui/ozone/platform/x11/x11_cursor_factory_ozone.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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_X11_X11_CURSOR_FACTORY_OZONE_H_ 5 #ifndef UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
6 #define UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_ 6 #define UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
7 7
8 #include <X11/X.h> 8 #include <X11/X.h>
9 9
10 #include <memory>
10 #include <unordered_map> 11 #include <unordered_map>
11 #include <vector> 12 #include <vector>
12 13
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "ui/base/cursor/cursor.h" 15 #include "ui/base/cursor/cursor.h"
16 #include "ui/ozone/public/cursor_factory_ozone.h" 16 #include "ui/ozone/public/cursor_factory_ozone.h"
17 #include "ui/platform_window/x11/x11_cursor_ozone.h" 17 #include "ui/platform_window/x11/x11_cursor_ozone.h"
18 18
19 namespace ui { 19 namespace ui {
20 20
21 // CursorFactoryOzone implementation for X11 cursors. 21 // CursorFactoryOzone implementation for X11 cursors.
22 class X11CursorFactoryOzone : public CursorFactoryOzone { 22 class X11CursorFactoryOzone : public CursorFactoryOzone {
23 public: 23 public:
24 X11CursorFactoryOzone(); 24 X11CursorFactoryOzone();
(...skipping 18 matching lines...) Expand all
43 scoped_refptr<X11CursorOzone> invisible_cursor_; 43 scoped_refptr<X11CursorOzone> invisible_cursor_;
44 44
45 std::unordered_map<int, scoped_refptr<X11CursorOzone>> default_cursors_; 45 std::unordered_map<int, scoped_refptr<X11CursorOzone>> default_cursors_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(X11CursorFactoryOzone); 47 DISALLOW_COPY_AND_ASSIGN(X11CursorFactoryOzone);
48 }; 48 };
49 49
50 } // namespace ui 50 } // namespace ui
51 51
52 #endif // UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_ 52 #endif // UI_OZONE_PLATFORM_X11_X11_CURSOR_FACTORY_OZONE_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/x11/ozone_platform_x11.cc ('k') | ui/ozone/platform/x11/x11_surface_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698