ui/views/mus/aura_init.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/views/mus/aura_init.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/views/mus/aura_init.h

diff --git a/ui/views/mus/aura_init.h b/ui/views/mus/aura_init.h

index 8e9e58aa6a6fc0cee2b1f9de08570e8e0940a1d6..911c44a595dd8d3df775e2913638045b28b3a316 100644

--- a/ui/views/mus/aura_init.h

+++ b/ui/views/mus/aura_init.h

@@ -9,7 +9,6 @@

#include <string>

#include "base/macros.h"

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

#include "build/build_config.h"

#include "skia/ext/refptr.h"

#include "ui/views/mus/mus_export.h"

@@ -46,7 +45,7 @@ class VIEWS_MUS_EXPORT AuraInit {

const std::string resource_file_;

std::unique_ptr<aura::Env> env_;

- scoped_ptr<ViewsDelegate> views_delegate_;

+ std::unique_ptr<ViewsDelegate> views_delegate_;

DISALLOW_COPY_AND_ASSIGN(AuraInit);

};

« no previous file with comments | « ui/views/mouse_watcher.cc ('k') | ui/views/mus/native_widget_mus.h » ('j') | no next file with comments »