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

Unified Diff: chrome/installer/util/firewall_manager_win.cc

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/firewall_manager_win.cc
diff --git a/chrome/installer/util/firewall_manager_win.cc b/chrome/installer/util/firewall_manager_win.cc
index 8c517bd98e77ff7e1c508568e7668d0f11858cb1..bec05ca3d209dfb746f494f3fce26bd4394b6dc9 100644
--- a/chrome/installer/util/firewall_manager_win.cc
+++ b/chrome/installer/util/firewall_manager_win.cc
@@ -6,6 +6,8 @@
#include <stdint.h>
+#include <utility>
+
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/strings/string16.h"
@@ -108,15 +110,15 @@ scoped_ptr<FirewallManager> FirewallManager::Create(
scoped_ptr<FirewallManagerAdvancedImpl> manager(
new FirewallManagerAdvancedImpl());
if (manager->Init(dist->GetDisplayName(), chrome_path))
- return manager.Pass();
+ return std::move(manager);
// Next try to connect to "Windows Firewall for Windows XP with SP2".
scoped_ptr<FirewallManagerLegacyImpl> legacy_manager(
new FirewallManagerLegacyImpl());
if (legacy_manager->Init(dist->GetDisplayName(), chrome_path))
- return legacy_manager.Pass();
+ return std::move(legacy_manager);
- return scoped_ptr<FirewallManager>();
+ return nullptr;
}
FirewallManager::FirewallManager() {
« no previous file with comments | « chrome/installer/util/chromium_binaries_distribution.cc ('k') | chrome/installer/util/google_chrome_distribution.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698