Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller. h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller. h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
22 #include "content/public/browser/web_contents.h" 22 #include "content/public/browser/web_contents.h"
23 23
24 using extensions::ExperienceSamplingEvent; 24 using extensions::ExperienceSamplingEvent;
25 25
26 namespace { 26 namespace {
27 27
28 void ShowExtensionInstallDialogImpl( 28 void ShowExtensionInstallDialogImpl(
29 ExtensionInstallPromptShowParams* show_params, 29 ExtensionInstallPromptShowParams* show_params,
30 const ExtensionInstallPrompt::DoneCallback& done_callback, 30 const ExtensionInstallPrompt::DoneCallback& done_callback,
31 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt) { 31 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt) {
32 // These objects will delete themselves when the dialog closes. 32 // These objects will delete themselves when the dialog closes.
33 if (!show_params->GetParentWebContents()) { 33 if (!show_params->GetParentWebContents()) {
34 new WindowedInstallDialogController(show_params, done_callback, 34 new WindowedInstallDialogController(show_params, done_callback,
35 std::move(prompt)); 35 std::move(prompt));
36 return; 36 return;
37 } 37 }
38 38
39 new ExtensionInstallDialogController(show_params, done_callback, 39 new ExtensionInstallDialogController(show_params, done_callback,
40 std::move(prompt)); 40 std::move(prompt));
41 } 41 }
42 42
43 } // namespace 43 } // namespace
44 44
45 ExtensionInstallDialogController::ExtensionInstallDialogController( 45 ExtensionInstallDialogController::ExtensionInstallDialogController(
46 ExtensionInstallPromptShowParams* show_params, 46 ExtensionInstallPromptShowParams* show_params,
47 const ExtensionInstallPrompt::DoneCallback& done_callback, 47 const ExtensionInstallPrompt::DoneCallback& done_callback,
48 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt) 48 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt)
49 : done_callback_(done_callback) { 49 : done_callback_(done_callback) {
50 ExtensionInstallPrompt::PromptType promptType = prompt->type(); 50 ExtensionInstallPrompt::PromptType promptType = prompt->type();
51 view_controller_.reset([[ExtensionInstallViewController alloc] 51 view_controller_.reset([[ExtensionInstallViewController alloc]
52 initWithProfile:show_params->profile() 52 initWithProfile:show_params->profile()
53 navigator:show_params->GetParentWebContents() 53 navigator:show_params->GetParentWebContents()
54 delegate:this 54 delegate:this
55 prompt:std::move(prompt)]); 55 prompt:std::move(prompt)]);
56 56
57 base::scoped_nsobject<NSWindow> window([[ConstrainedWindowCustomWindow alloc] 57 base::scoped_nsobject<NSWindow> window([[ConstrainedWindowCustomWindow alloc]
58 initWithContentRect:[[view_controller_ view] bounds]]); 58 initWithContentRect:[[view_controller_ view] bounds]]);
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 sampling_event_->CreateUserDecisionEvent(decision_event); 107 sampling_event_->CreateUserDecisionEvent(decision_event);
108 base::ResetAndReturn(&done_callback_).Run(result); 108 base::ResetAndReturn(&done_callback_).Run(result);
109 constrained_window_->CloseWebContentsModalDialog(); 109 constrained_window_->CloseWebContentsModalDialog();
110 } 110 }
111 111
112 // static 112 // static
113 ExtensionInstallPrompt::ShowDialogCallback 113 ExtensionInstallPrompt::ShowDialogCallback
114 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { 114 ExtensionInstallPrompt::GetDefaultShowDialogCallback() {
115 return base::Bind(&ShowExtensionInstallDialogImpl); 115 return base::Bind(&ShowExtensionInstallDialogImpl);
116 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698