chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h - Issue 1865213004: Convert //chrome/browser/ui 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: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h

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

Patch Set: rebase 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 | « chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm ('k') | chrome/browser/ui/cocoa/tab_dialogs_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h

diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h

index fa77dfb2fbb1a76d219c8e29803aad4b22d5df3a..ad0e0de4a1d3829b938c0ac2b3a92cb643cc90f1 100644

--- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h

+++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h

@@ -7,7 +7,7 @@

#include <Cocoa/Cocoa.h>

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

+#include <memory>

class FullscreenObserver;

@@ -36,7 +36,7 @@ class WebContents;

content::WebContents* contents_; // weak

// When |fullscreenObserver_| is not-NULL, TabContentsController monitors for

// and auto-embeds fullscreen widgets as a subview.

- scoped_ptr<FullscreenObserver> fullscreenObserver_;

+ std::unique_ptr<FullscreenObserver> fullscreenObserver_;

// Set to true while TabContentsController is embedding a fullscreen widget

// view as a subview instead of the normal WebContentsView render view.

// Note: This will be false in the case of non-Flash fullscreen.