ui/base/clipboard/clipboard_win.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/clipboard/clipboard_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/base/clipboard/clipboard_test_template.h ('k') | ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/base/clipboard/clipboard_win.h

diff --git a/ui/base/clipboard/clipboard_win.h b/ui/base/clipboard/clipboard_win.h

index 63bdfa114c5e31a0eecb9317e2e5b3325486b2e9..f6451a1bcd8ece0c08a75c628ceee7113af08542 100644

--- a/ui/base/clipboard/clipboard_win.h

+++ b/ui/base/clipboard/clipboard_win.h

@@ -5,13 +5,13 @@

#ifndef UI_BASE_CLIPBOARD_CLIPBOARD_WIN_H_

#define UI_BASE_CLIPBOARD_CLIPBOARD_WIN_H_

-#include "ui/base/clipboard/clipboard.h"

#include <stddef.h>

#include <stdint.h>

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

+#include "ui/base/clipboard/clipboard.h"

namespace ui {

@@ -71,7 +71,7 @@ class ClipboardWin : public Clipboard {

HWND GetClipboardWindow() const;

// Mark this as mutable so const methods can still do lazy initialization.

- mutable scoped_ptr<base::win::MessageWindow> clipboard_owner_;

+ mutable std::unique_ptr<base::win::MessageWindow> clipboard_owner_;

DISALLOW_COPY_AND_ASSIGN(ClipboardWin);

};