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

Side by Side Diff: chrome/browser/extensions/extension_install_prompt.cc

Issue 2257113002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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 #include "chrome/browser/extensions/extension_install_prompt.h" 5 #include "chrome/browser/extensions/extension_install_prompt.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 627
628 ExtensionInstallPrompt::~ExtensionInstallPrompt() { 628 ExtensionInstallPrompt::~ExtensionInstallPrompt() {
629 } 629 }
630 630
631 void ExtensionInstallPrompt::ShowDialog( 631 void ExtensionInstallPrompt::ShowDialog(
632 const DoneCallback& done_callback, 632 const DoneCallback& done_callback,
633 const Extension* extension, 633 const Extension* extension,
634 const SkBitmap* icon, 634 const SkBitmap* icon,
635 const ShowDialogCallback& show_dialog_callback) { 635 const ShowDialogCallback& show_dialog_callback) {
636 ShowDialog(done_callback, extension, icon, 636 ShowDialog(done_callback, extension, icon,
637 base::WrapUnique(new Prompt(INSTALL_PROMPT)), 637 base::MakeUnique<Prompt>(INSTALL_PROMPT), show_dialog_callback);
638 show_dialog_callback);
639 } 638 }
640 639
641 void ExtensionInstallPrompt::ShowDialog( 640 void ExtensionInstallPrompt::ShowDialog(
642 const DoneCallback& done_callback, 641 const DoneCallback& done_callback,
643 const Extension* extension, 642 const Extension* extension,
644 const SkBitmap* icon, 643 const SkBitmap* icon,
645 std::unique_ptr<Prompt> prompt, 644 std::unique_ptr<Prompt> prompt,
646 const ShowDialogCallback& show_dialog_callback) { 645 const ShowDialogCallback& show_dialog_callback) {
647 ShowDialog(done_callback, extension, icon, std::move(prompt), nullptr, 646 ShowDialog(done_callback, extension, icon, std::move(prompt), nullptr,
648 show_dialog_callback); 647 show_dialog_callback);
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 822
824 if (AutoConfirmPrompt(&done_callback_)) 823 if (AutoConfirmPrompt(&done_callback_))
825 return; 824 return;
826 825
827 if (show_dialog_callback_.is_null()) 826 if (show_dialog_callback_.is_null())
828 show_dialog_callback_ = GetDefaultShowDialogCallback(); 827 show_dialog_callback_ = GetDefaultShowDialogCallback();
829 base::ResetAndReturn(&show_dialog_callback_) 828 base::ResetAndReturn(&show_dialog_callback_)
830 .Run(show_params_.get(), base::ResetAndReturn(&done_callback_), 829 .Run(show_params_.get(), base::ResetAndReturn(&done_callback_),
831 std::move(prompt_)); 830 std::move(prompt_));
832 } 831 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698