chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.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/browser/exclusive_access_controller_views.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/browser/edit_search_engine_cocoa_controller.h ('k') | chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h

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

index b3c2ab6bf94f3d232144feb2634a743c4c604351..ef5a231406683c8778e2d4e542b99ddb6999c737 100644

--- a/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h

+++ b/chrome/browser/ui/cocoa/browser/exclusive_access_controller_views.h

@@ -10,9 +10,10 @@

#import <CoreGraphics/CoreGraphics.h>

+#include <memory>

#import "base/mac/scoped_nsobject.h"

#include "base/macros.h"

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

#include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"

#include "chrome/browser/ui/views/exclusive_access_bubble_views_context.h"

#include "components/prefs/pref_change_registrar.h"

@@ -96,7 +97,7 @@ class ExclusiveAccessController : public ExclusiveAccessContext,

GURL url_;

ExclusiveAccessBubbleType bubble_type_;

- scoped_ptr<ExclusiveAccessBubbleViews> views_bubble_;

+ std::unique_ptr<ExclusiveAccessBubbleViews> views_bubble_;

base::scoped_nsobject<ExclusiveAccessBubbleWindowController> cocoa_bubble_;

// Used to keep track of the kShowFullscreenToolbar preference.