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

Unified Diff: chrome/browser/extensions/external_install_error.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
« no previous file with comments | « chrome/browser/extensions/extension_util.cc ('k') | chrome/browser/extensions/external_pref_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/external_install_error.cc
diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc
index cd13c2785a0d5454e102ea7b90dee973acba511f..3b52ef741fff100639755a7567c418934e2dbed9 100644
--- a/chrome/browser/extensions/external_install_error.cc
+++ b/chrome/browser/extensions/external_install_error.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/external_install_error.h"
#include <stddef.h>
+#include <utility>
#include "base/bind.h"
#include "base/macros.h"
@@ -336,7 +337,7 @@ void ExternalInstallError::ShowDialog(Browser* browser) {
install_ui_show_params_.reset(
new ExtensionInstallPromptShowParams(web_contents));
ExtensionInstallPrompt::GetDefaultShowDialogCallback().Run(
- install_ui_show_params_.get(), this, prompt_.Pass());
+ install_ui_show_params_.get(), this, std::move(prompt_));
}
const Extension* ExternalInstallError::GetExtension() const {
@@ -385,7 +386,7 @@ void ExternalInstallError::OnFetchComplete() {
install_ui_->ShowDialog(this, GetExtension(),
nullptr, // Force a fetch of the icon.
- prompt_.Pass(),
+ std::move(prompt_),
base::Bind(&ExternalInstallError::OnDialogReady,
weak_factory_.GetWeakPtr()));
}
@@ -395,7 +396,7 @@ void ExternalInstallError::OnDialogReady(
ExtensionInstallPrompt::Delegate* prompt_delegate,
scoped_ptr<ExtensionInstallPrompt::Prompt> prompt) {
DCHECK_EQ(this, prompt_delegate);
- prompt_ = prompt.Pass();
+ prompt_ = std::move(prompt);
if (alert_type_ == BUBBLE_ALERT) {
global_error_.reset(new ExternalInstallBubbleAlert(this, prompt_.get()));
« no previous file with comments | « chrome/browser/extensions/extension_util.cc ('k') | chrome/browser/extensions/external_pref_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698