content/browser/web_contents/web_contents_view_mus.h - Issue 1874893002: Convert //content/browser from scoped_ptr 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: content/browser/web_contents/web_contents_view_mus.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « content/browser/web_contents/web_contents_view_mac.h ('k') | content/browser/web_contents/web_contents_view_overscroll_animator_slider_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_view_mus.h

diff --git a/content/browser/web_contents/web_contents_view_mus.h b/content/browser/web_contents/web_contents_view_mus.h

index 05d51d1a49e38e8fdee4a3726fddfa6483954d47..fab1165903e62a16c81f20cdc2d3c25809006f03 100644

--- a/content/browser/web_contents/web_contents_view_mus.h

+++ b/content/browser/web_contents/web_contents_view_mus.h

@@ -5,10 +5,10 @@

#ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_

#define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_VIEW_MUS_H_

+#include <memory>

#include <vector>

#include "base/macros.h"

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

#include "build/build_config.h"

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

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

@@ -107,9 +107,9 @@ class WebContentsViewMus : public WebContentsView,

// The WebContentsImpl whose contents we display.

WebContentsImpl* web_contents_;

- scoped_ptr<WebContentsViewDelegate> delegate_;

- scoped_ptr<aura::Window> aura_window_;

- scoped_ptr<mus::ScopedWindowPtr> mus_window_;

+ std::unique_ptr<WebContentsViewDelegate> delegate_;

+ std::unique_ptr<aura::Window> aura_window_;

+ std::unique_ptr<mus::ScopedWindowPtr> mus_window_;

DISALLOW_COPY_AND_ASSIGN(WebContentsViewMus);

};