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

Unified Diff: ash/system/chromeos/network/vpn_list_view.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: ash/system/chromeos/network/vpn_list_view.cc
diff --git a/ash/system/chromeos/network/vpn_list_view.cc b/ash/system/chromeos/network/vpn_list_view.cc
index ed130bef597160455c2996ad4abe30c2cf3f4e4f..23ef0311b4bdecdf8cffddcd5caa9e0a6f67ddb6 100644
--- a/ash/system/chromeos/network/vpn_list_view.cc
+++ b/ash/system/chromeos/network/vpn_list_view.cc
@@ -4,6 +4,7 @@
#include "ash/system/chromeos/network/vpn_list_view.h"
+#include <memory>
#include <utility>
#include <vector>
@@ -17,7 +18,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chromeos/network/network_connection_handler.h"
@@ -49,8 +49,7 @@ bool IsConnectedOrConnecting(const chromeos::NetworkState* network) {
}
void IgnoreDisconnectError(const std::string& error_name,
- scoped_ptr<base::DictionaryValue> error_data) {
-}
+ std::unique_ptr<base::DictionaryValue> error_data) {}
// The base class of all list entries, a |HoverHighlightView| with no border.
class VPNListEntryBase : public HoverHighlightView {
@@ -252,7 +251,7 @@ VPNListView::~VPNListView() {
void VPNListView::Update() {
// Before updating the list, determine whether the user was hovering over one
// of the VPN provider or network entries.
- scoped_ptr<VPNProvider::Key> hovered_provider_key;
+ std::unique_ptr<VPNProvider::Key> hovered_provider_key;
std::string hovered_network_service_path;
for (const std::pair<const views::View* const, VPNProvider::Key>& provider :
provider_view_key_map_) {

Powered by Google App Engine
This is Rietveld 408576698