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

Unified Diff: chrome/browser/ui/extensions/extension_action_view_controller.cc

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/ui/extensions/extension_action_view_controller.cc
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc
index fbb8ebbab68afad7a5707a844917f42cfbe74146..c0a484d7316f5b3a6ec732fe9cdbdb77c3a45e24 100644
--- a/chrome/browser/ui/extensions/extension_action_view_controller.cc
+++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/extensions/extension_action_view_controller.h"
+#include <utility>
+
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/api/commands/command_service.h"
@@ -321,12 +323,10 @@ bool ExtensionActionViewController::TriggerPopupWithUrl(
toolbar_actions_bar_->PopOutAction(
this,
base::Bind(&ExtensionActionViewController::ShowPopup,
- weak_factory_.GetWeakPtr(),
- base::Passed(host.Pass()),
- grant_tab_permissions,
- show_action));
+ weak_factory_.GetWeakPtr(), base::Passed(std::move(host)),
+ grant_tab_permissions, show_action));
} else {
- ShowPopup(host.Pass(), grant_tab_permissions, show_action);
+ ShowPopup(std::move(host), grant_tab_permissions, show_action);
}
return true;
@@ -340,8 +340,8 @@ void ExtensionActionViewController::ShowPopup(
// (since it can open asynchronously). Check before proceeding.
if (!popup_host_)
return;
- platform_delegate_->ShowPopup(
- popup_host.Pass(), grant_tab_permissions, show_action);
+ platform_delegate_->ShowPopup(std::move(popup_host), grant_tab_permissions,
+ show_action);
view_delegate_->OnPopupShown(grant_tab_permissions);
}
@@ -375,7 +375,7 @@ ExtensionActionViewController::GetIconImageSource(
extension_action_->GetBadgeTextColor(tab_id),
extension_action_->GetBadgeBackgroundColor(tab_id)));
}
- image_source->SetBadge(badge.Pass());
+ image_source->SetBadge(std::move(badge));
// Greyscaling disabled actions and having a special wants-to-run decoration
// are gated on the toolbar redesign.
@@ -392,5 +392,5 @@ ExtensionActionViewController::GetIconImageSource(
image_source->set_paint_decoration(WantsToRun(web_contents) && is_overflow);
}
- return image_source.Pass();
+ return image_source;
}
« no previous file with comments | « chrome/browser/ui/crypto_module_delegate_nss.cc ('k') | chrome/browser/ui/extensions/extension_installed_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698