| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chromeos/network/network_profile_handler.h" | 5 #include "chromeos/network/network_profile_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include <algorithm> | 9 #include <algorithm> |
| 8 | 10 |
| 9 #include "base/bind.h" | 11 #include "base/bind.h" |
| 10 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 11 #include "base/values.h" | 13 #include "base/values.h" |
| 12 #include "chromeos/dbus/dbus_thread_manager.h" | 14 #include "chromeos/dbus/dbus_thread_manager.h" |
| 13 #include "chromeos/dbus/shill_manager_client.h" | 15 #include "chromeos/dbus/shill_manager_client.h" |
| 14 #include "chromeos/dbus/shill_profile_client.h" | 16 #include "chromeos/dbus/shill_profile_client.h" |
| 15 #include "chromeos/network/network_profile_observer.h" | 17 #include "chromeos/network/network_profile_observer.h" |
| 16 #include "dbus/object_path.h" | 18 #include "dbus/object_path.h" |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback, | 217 base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback, |
| 216 weak_ptr_factory_.GetWeakPtr())); | 218 weak_ptr_factory_.GetWeakPtr())); |
| 217 } | 219 } |
| 218 | 220 |
| 219 NetworkProfileHandler::~NetworkProfileHandler() { | 221 NetworkProfileHandler::~NetworkProfileHandler() { |
| 220 DBusThreadManager::Get()->GetShillManagerClient()-> | 222 DBusThreadManager::Get()->GetShillManagerClient()-> |
| 221 RemovePropertyChangedObserver(this); | 223 RemovePropertyChangedObserver(this); |
| 222 } | 224 } |
| 223 | 225 |
| 224 } // namespace chromeos | 226 } // namespace chromeos |
| OLD | NEW |