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

Side by Side Diff: ui/display/win/screen_win.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/display/util/edid_parser_unittest.cc ('k') | ui/display/win/screen_win_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 (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 UI_DISPLAY_WIN_SCREEN_WIN_H_ 5 #ifndef UI_DISPLAY_WIN_SCREEN_WIN_H_
6 #define UI_DISPLAY_WIN_SCREEN_WIN_H_ 6 #define UI_DISPLAY_WIN_SCREEN_WIN_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 9
10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "ui/display/display_export.h" 14 #include "ui/display/display_export.h"
15 #include "ui/gfx/display_change_notifier.h" 15 #include "ui/gfx/display_change_notifier.h"
16 #include "ui/gfx/native_widget_types.h" 16 #include "ui/gfx/native_widget_types.h"
17 #include "ui/gfx/screen.h" 17 #include "ui/gfx/screen.h"
18 #include "ui/gfx/win/singleton_hwnd_observer.h" 18 #include "ui/gfx/win/singleton_hwnd_observer.h"
19 19
20 namespace gfx { 20 namespace gfx {
21 class Display; 21 class Display;
22 class Point; 22 class Point;
23 class Rect; 23 class Rect;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 const gfx::Point& screen_point) const; 81 const gfx::Point& screen_point) const;
82 82
83 // Returns the ScreenWinDisplay corresponding to the primary monitor. 83 // Returns the ScreenWinDisplay corresponding to the primary monitor.
84 ScreenWinDisplay GetPrimaryScreenWinDisplay() const; 84 ScreenWinDisplay GetPrimaryScreenWinDisplay() const;
85 85
86 ScreenWinDisplay GetScreenWinDisplay(const MONITORINFOEX& monitor_info) const; 86 ScreenWinDisplay GetScreenWinDisplay(const MONITORINFOEX& monitor_info) const;
87 87
88 // Helper implementing the DisplayObserver handling. 88 // Helper implementing the DisplayObserver handling.
89 gfx::DisplayChangeNotifier change_notifier_; 89 gfx::DisplayChangeNotifier change_notifier_;
90 90
91 scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_; 91 std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
92 92
93 // Current list of ScreenWinDisplays. 93 // Current list of ScreenWinDisplays.
94 std::vector<ScreenWinDisplay> screen_win_displays_; 94 std::vector<ScreenWinDisplay> screen_win_displays_;
95 95
96 DISALLOW_COPY_AND_ASSIGN(ScreenWin); 96 DISALLOW_COPY_AND_ASSIGN(ScreenWin);
97 }; 97 };
98 98
99 } // namespace win 99 } // namespace win
100 } // namespace display 100 } // namespace display
101 101
102 #endif // UI_DISPLAY_WIN_SCREEN_WIN_H_ 102 #endif // UI_DISPLAY_WIN_SCREEN_WIN_H_
OLDNEW
« no previous file with comments | « ui/display/util/edid_parser_unittest.cc ('k') | ui/display/win/screen_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698