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

Unified Diff: chrome/browser/extensions/extension_install_prompt.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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
Index: chrome/browser/extensions/extension_install_prompt.cc
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 4c1af25f84353708080df52cf568c232a8b3c91c..6345f4f65b39c0c21d2a39bf15d0bcbeac5cfad8 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/extension_install_prompt.h"
+#include <utility>
+
#include "base/location.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -656,7 +658,7 @@ void ExtensionInstallPrompt::ShowDialog(
const SkBitmap* icon,
scoped_ptr<Prompt> prompt,
const ShowDialogCallback& show_dialog_callback) {
- ShowDialog(delegate, extension, icon, prompt.Pass(), nullptr,
+ ShowDialog(delegate, extension, icon, std::move(prompt), nullptr,
show_dialog_callback);
}
@@ -673,8 +675,8 @@ void ExtensionInstallPrompt::ShowDialog(
delegate_ = delegate;
if (icon && !icon->empty())
SetIcon(icon);
- prompt_ = prompt.Pass();
- custom_permissions_ = custom_permissions.Pass();
+ prompt_ = std::move(prompt);
+ custom_permissions_ = std::move(custom_permissions);
show_dialog_callback_ = show_dialog_callback;
// We special-case themes to not show any confirm UI. Instead they are
@@ -843,7 +845,8 @@ void ExtensionInstallPrompt::ShowConfirmation() {
if (show_dialog_callback_.is_null())
GetDefaultShowDialogCallback().Run(show_params_.get(), delegate_,
- prompt_.Pass());
+ std::move(prompt_));
else
- show_dialog_callback_.Run(show_params_.get(), delegate_, prompt_.Pass());
+ show_dialog_callback_.Run(show_params_.get(), delegate_,
+ std::move(prompt_));
}

Powered by Google App Engine
This is Rietveld 408576698