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

Side by Side Diff: ui/chromeos/network/network_state_notifier.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/chromeos/network/network_state_notifier.h" 5 #include "ui/chromeos/network/network_state_notifier.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // unexpected idle state transition occurs, see crbug.com/333955. 333 // unexpected idle state transition occurs, see crbug.com/333955.
334 return; 334 return;
335 } 335 }
336 ShowConnectErrorNotification(error_name, service_path, shill_properties); 336 ShowConnectErrorNotification(error_name, service_path, shill_properties);
337 } 337 }
338 338
339 void NetworkStateNotifier::ConnectErrorPropertiesFailed( 339 void NetworkStateNotifier::ConnectErrorPropertiesFailed(
340 const std::string& error_name, 340 const std::string& error_name,
341 const std::string& service_path, 341 const std::string& service_path,
342 const std::string& shill_connect_error, 342 const std::string& shill_connect_error,
343 scoped_ptr<base::DictionaryValue> shill_error_data) { 343 std::unique_ptr<base::DictionaryValue> shill_error_data) {
344 base::DictionaryValue shill_properties; 344 base::DictionaryValue shill_properties;
345 ShowConnectErrorNotification(error_name, service_path, shill_properties); 345 ShowConnectErrorNotification(error_name, service_path, shill_properties);
346 } 346 }
347 347
348 void NetworkStateNotifier::ShowConnectErrorNotification( 348 void NetworkStateNotifier::ShowConnectErrorNotification(
349 const std::string& error_name, 349 const std::string& error_name,
350 const std::string& service_path, 350 const std::string& service_path,
351 const base::DictionaryValue& shill_properties) { 351 const base::DictionaryValue& shill_properties) {
352 base::string16 error = GetConnectErrorString(error_name); 352 base::string16 error = GetConnectErrorString(error_name);
353 NET_LOG(DEBUG) << "Notify: " << service_path 353 NET_LOG(DEBUG) << "Notify: " << service_path
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 error_msg, base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath, 448 error_msg, base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
449 weak_ptr_factory_.GetWeakPtr(), vpn->path())); 449 weak_ptr_factory_.GetWeakPtr(), vpn->path()));
450 } 450 }
451 451
452 void NetworkStateNotifier::ShowNetworkSettingsForPath( 452 void NetworkStateNotifier::ShowNetworkSettingsForPath(
453 const std::string& service_path) { 453 const std::string& service_path) {
454 network_connect_->ShowNetworkSettingsForPath(service_path); 454 network_connect_->ShowNetworkSettingsForPath(service_path);
455 } 455 }
456 456
457 } // namespace ui 457 } // namespace ui
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_state_notifier.h ('k') | ui/chromeos/network/network_state_notifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698