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

Side by Side Diff: chrome/browser/extensions/api/management/chrome_management_api_delegate.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/api/management/chrome_management_api_delegat e.h" 5 #include "chrome/browser/extensions/api/management/chrome_management_api_delegat e.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 callback_(callback), 54 callback_(callback),
55 weak_factory_(this) { 55 weak_factory_(this) {
56 ExtensionInstallPrompt::PromptType type = 56 ExtensionInstallPrompt::PromptType type =
57 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension( 57 ExtensionInstallPrompt::GetReEnablePromptTypeForExtension(
58 browser_context, extension); 58 browser_context, extension);
59 install_prompt_->ShowDialog( 59 install_prompt_->ShowDialog(
60 base::Bind(&ManagementSetEnabledFunctionInstallPromptDelegate:: 60 base::Bind(&ManagementSetEnabledFunctionInstallPromptDelegate::
61 OnInstallPromptDone, 61 OnInstallPromptDone,
62 weak_factory_.GetWeakPtr()), 62 weak_factory_.GetWeakPtr()),
63 extension, nullptr, 63 extension, nullptr,
64 base::WrapUnique(new ExtensionInstallPrompt::Prompt(type)), 64 base::MakeUnique<ExtensionInstallPrompt::Prompt>(type),
65 ExtensionInstallPrompt::GetDefaultShowDialogCallback()); 65 ExtensionInstallPrompt::GetDefaultShowDialogCallback());
66 } 66 }
67 ~ManagementSetEnabledFunctionInstallPromptDelegate() override {} 67 ~ManagementSetEnabledFunctionInstallPromptDelegate() override {}
68 68
69 private: 69 private:
70 void OnInstallPromptDone(ExtensionInstallPrompt::Result result) { 70 void OnInstallPromptDone(ExtensionInstallPrompt::Result result) {
71 base::ResetAndReturn(&callback_).Run( 71 base::ResetAndReturn(&callback_).Run(
72 result == ExtensionInstallPrompt::Result::ACCEPTED); 72 result == ExtensionInstallPrompt::Result::ACCEPTED);
73 } 73 }
74 74
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 content::BrowserContext* browser_context, 219 content::BrowserContext* browser_context,
220 const extensions::Extension* extension, 220 const extensions::Extension* extension,
221 const base::Callback<void(bool)>& callback) const { 221 const base::Callback<void(bool)>& callback) const {
222 return std::unique_ptr<ManagementSetEnabledFunctionInstallPromptDelegate>( 222 return std::unique_ptr<ManagementSetEnabledFunctionInstallPromptDelegate>(
223 new ManagementSetEnabledFunctionInstallPromptDelegate( 223 new ManagementSetEnabledFunctionInstallPromptDelegate(
224 web_contents, browser_context, extension, callback)); 224 web_contents, browser_context, extension, callback));
225 } 225 }
226 226
227 std::unique_ptr<extensions::RequirementsChecker> 227 std::unique_ptr<extensions::RequirementsChecker>
228 ChromeManagementAPIDelegate::CreateRequirementsChecker() const { 228 ChromeManagementAPIDelegate::CreateRequirementsChecker() const {
229 return base::WrapUnique(new extensions::ChromeRequirementsChecker()); 229 return base::MakeUnique<extensions::ChromeRequirementsChecker>();
230 } 230 }
231 231
232 std::unique_ptr<extensions::UninstallDialogDelegate> 232 std::unique_ptr<extensions::UninstallDialogDelegate>
233 ChromeManagementAPIDelegate::UninstallFunctionDelegate( 233 ChromeManagementAPIDelegate::UninstallFunctionDelegate(
234 extensions::ManagementUninstallFunctionBase* function, 234 extensions::ManagementUninstallFunctionBase* function,
235 const extensions::Extension* target_extension, 235 const extensions::Extension* target_extension,
236 bool show_programmatic_uninstall_ui) const { 236 bool show_programmatic_uninstall_ui) const {
237 return std::unique_ptr<extensions::UninstallDialogDelegate>( 237 return std::unique_ptr<extensions::UninstallDialogDelegate>(
238 new ManagementUninstallFunctionUninstallDialogDelegate( 238 new ManagementUninstallFunctionUninstallDialogDelegate(
239 function, target_extension, show_programmatic_uninstall_ui)); 239 function, target_extension, show_programmatic_uninstall_ui));
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 335
336 GURL ChromeManagementAPIDelegate::GetIconURL( 336 GURL ChromeManagementAPIDelegate::GetIconURL(
337 const extensions::Extension* extension, 337 const extensions::Extension* extension,
338 int icon_size, 338 int icon_size,
339 ExtensionIconSet::MatchType match, 339 ExtensionIconSet::MatchType match,
340 bool grayscale, 340 bool grayscale,
341 bool* exists) const { 341 bool* exists) const {
342 return extensions::ExtensionIconSource::GetIconURL(extension, icon_size, 342 return extensions::ExtensionIconSource::GetIconURL(extension, icon_size,
343 match, grayscale, exists); 343 match, grayscale, exists);
344 } 344 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698