ui/base/cursor/image_cursors.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/cursor/image_cursors.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

Index: ui/base/cursor/image_cursors.h

diff --git a/ui/base/cursor/image_cursors.h b/ui/base/cursor/image_cursors.h

index be3c7fbf2fa5550dc4c815a2525a64bb3d18e1fc..01f3b08cf11bc7fd7dcd9fa2193060c28e0a9991 100644

--- a/ui/base/cursor/image_cursors.h

+++ b/ui/base/cursor/image_cursors.h

@@ -5,8 +5,9 @@

#ifndef UI_BASE_CURSOR_IMAGE_CURSORS_H_

#define UI_BASE_CURSOR_IMAGE_CURSORS_H_

+#include <memory>

#include "base/macros.h"

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

#include "base/strings/string16.h"

#include "ui/base/cursor/cursor.h"

#include "ui/base/ui_base_export.h"

@@ -42,7 +43,7 @@ class UI_BASE_EXPORT ImageCursors {

// Reloads the all loaded cursors in the cursor loader.

void ReloadCursors();

- scoped_ptr<CursorLoader> cursor_loader_;

+ std::unique_ptr<CursorLoader> cursor_loader_;

CursorSetType cursor_set_;

DISALLOW_COPY_AND_ASSIGN(ImageCursors);

« no previous file with comments | « ui/base/cursor/cursors_aura.cc ('k') | ui/base/dragdrop/os_exchange_data.h » ('j') | no next file with comments »