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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/win/screen_win.h
diff --git a/ui/display/win/screen_win.h b/ui/display/win/screen_win.h
index da18ed1c7aed9318cf221948ef5e60b519898c9f..f1c56308e9a481c000269a1336a2a20bc32f5b71 100644
--- a/ui/display/win/screen_win.h
+++ b/ui/display/win/screen_win.h
@@ -7,10 +7,10 @@
#include <windows.h>
+#include <memory>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/display/display_export.h"
#include "ui/gfx/display_change_notifier.h"
#include "ui/gfx/native_widget_types.h"
@@ -88,7 +88,7 @@ class DISPLAY_EXPORT ScreenWin : public gfx::Screen {
// Helper implementing the DisplayObserver handling.
gfx::DisplayChangeNotifier change_notifier_;
- scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
+ std::unique_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
// Current list of ScreenWinDisplays.
std::vector<ScreenWinDisplay> screen_win_displays_;
« 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