ui/mojo/init/ui_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/mojo/init/ui_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/mojo/init/ui_init.h

diff --git a/ui/mojo/init/ui_init.h b/ui/mojo/init/ui_init.h

index 9956b17cedfb88999c2d2b5f7f36417fe62459f9..ae9bf983ae91ffaf1cd782e844d3812525159d8f 100644

--- a/ui/mojo/init/ui_init.h

+++ b/ui/mojo/init/ui_init.h

@@ -5,11 +5,11 @@

#ifndef UI_MOJO_INIT_UI_INIT_H_

#define UI_MOJO_INIT_UI_INIT_H_

+#include <memory>

#include <vector>

#include "base/callback_forward.h"

#include "base/macros.h"

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

#include "build/build_config.h"

namespace gfx {

@@ -32,9 +32,9 @@ class UIInit {

~UIInit();

private:

- scoped_ptr<gfx::Screen> screen_;

+ std::unique_ptr<gfx::Screen> screen_;

#if defined(OS_ANDROID)

- scoped_ptr<GestureConfigurationMojo> gesture_configuration_;

+ std::unique_ptr<GestureConfigurationMojo> gesture_configuration_;

#endif

DISALLOW_COPY_AND_ASSIGN(UIInit);

« no previous file with comments | « ui/message_center/views/toast_contents_view.cc ('k') | ui/native_theme/common_theme.h » ('j') | no next file with comments »