chrome/browser/ui/cocoa/browser_window_controller.mm - 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_window_controller.mm

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

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm

index 3e01fcee6961ab6685c8b3a8d95555e8b641b897..328873278325eeb8a1854e530d277969a3c837b5 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -1582,13 +1582,12 @@ void SetUpBrowserWindowCommandHandler(NSWindow* window) {

ChromeTranslateClient::GetTranslateLanguages(

contents, &sourceLanguage, &targetLanguage);

- scoped_ptr<translate::TranslateUIDelegate> uiDelegate(

+ std::unique_ptr<translate::TranslateUIDelegate> uiDelegate(

new translate::TranslateUIDelegate(

ChromeTranslateClient::GetManagerFromWebContents(contents)

->GetWeakPtr(),

- sourceLanguage,

- targetLanguage));

- scoped_ptr<TranslateBubbleModel> model(

+ sourceLanguage, targetLanguage));

+ std::unique_ptr<TranslateBubbleModel> model(

new TranslateBubbleModelImpl(step, std::move(uiDelegate)));

translateBubbleController_ =

[[TranslateBubbleController alloc] initWithParentWindow:self