mash/example/common/mus_views_init.h - Issue 1857623003: convert //mash to std::unique_ptr

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: mash/example/common/mus_views_init.h

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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:

Index: mash/example/common/mus_views_init.h

diff --git a/mash/example/common/mus_views_init.h b/mash/example/common/mus_views_init.h

index aff5dc70efc318324305e99c7594031ba5b17173..04a02ec57657b6bc5637ec1370fec4d6b7531352 100644

--- a/mash/example/common/mus_views_init.h

+++ b/mash/example/common/mus_views_init.h

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

#ifndef MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_

#define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_

+#include <memory>

#include "base/macros.h"

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

#include "components/mus/public/cpp/window_tree_delegate.h"

#include "components/mus/public/interfaces/window_manager.mojom.h"

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

@@ -45,7 +46,7 @@ class MUSViewsInit : public views::ViewsDelegate,

#endif

mojo::ShellConnection* app_;

- scoped_ptr<views::AuraInit> aura_init_;

+ std::unique_ptr<views::AuraInit> aura_init_;

mus::mojom::WindowManagerPtr window_manager_;

DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);