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

Side by Side Diff: ash/wm/ash_native_cursor_manager.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/wm/ash_focus_rules_unittest.cc ('k') | ash/wm/boot_splash_screen_chromeos.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WM_ASH_NATIVE_CURSOR_MANAGER_H_ 5 #ifndef ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
6 #define ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_ 6 #define ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
13 #include "ui/gfx/geometry/point.h" 14 #include "ui/gfx/geometry/point.h"
14 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
15 #include "ui/wm/core/native_cursor_manager.h" 16 #include "ui/wm/core/native_cursor_manager.h"
16 #include "ui/wm/core/native_cursor_manager_delegate.h" 17 #include "ui/wm/core/native_cursor_manager_delegate.h"
17 18
18 namespace ui { 19 namespace ui {
19 class ImageCursors; 20 class ImageCursors;
20 } 21 }
21 22
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ::wm::NativeCursorManagerDelegate* delegate) override; 56 ::wm::NativeCursorManagerDelegate* delegate) override;
56 void SetMouseEventsEnabled( 57 void SetMouseEventsEnabled(
57 bool enabled, 58 bool enabled,
58 ::wm::NativeCursorManagerDelegate* delegate) override; 59 ::wm::NativeCursorManagerDelegate* delegate) override;
59 60
60 // The cursor location where the cursor was disabled. 61 // The cursor location where the cursor was disabled.
61 gfx::Point disabled_cursor_location_; 62 gfx::Point disabled_cursor_location_;
62 63
63 bool native_cursor_enabled_; 64 bool native_cursor_enabled_;
64 65
65 scoped_ptr<ui::ImageCursors> image_cursors_; 66 std::unique_ptr<ui::ImageCursors> image_cursors_;
66 67
67 DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager); 68 DISALLOW_COPY_AND_ASSIGN(AshNativeCursorManager);
68 }; 69 };
69 70
70 } // namespace ash 71 } // namespace ash
71 72
72 #endif // ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_ 73 #endif // ASH_WM_ASH_NATIVE_CURSOR_MANAGER_H_
OLDNEW
« no previous file with comments | « ash/wm/ash_focus_rules_unittest.cc ('k') | ash/wm/boot_splash_screen_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698