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 <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 return profile.path == path_; | 49 return profile.path == path_; |
50 } | 50 } |
51 | 51 |
52 private: | 52 private: |
53 std::string path_; | 53 std::string path_; |
54 }; | 54 }; |
55 | 55 |
56 } // namespace | 56 } // namespace |
57 | 57 |
58 // static | 58 // static |
59 const char NetworkProfileHandler::kSharedProfilePath[] = "/profile/default"; | 59 const char* NetworkProfileHandler::GetSharedProfilePath() { |
| 60 return ShillProfileClient::GetSharedProfilePath(); |
| 61 } |
60 | 62 |
61 void NetworkProfileHandler::AddObserver(NetworkProfileObserver* observer) { | 63 void NetworkProfileHandler::AddObserver(NetworkProfileObserver* observer) { |
62 observers_.AddObserver(observer); | 64 observers_.AddObserver(observer); |
63 } | 65 } |
64 | 66 |
65 void NetworkProfileHandler::RemoveObserver(NetworkProfileObserver* observer) { | 67 void NetworkProfileHandler::RemoveObserver(NetworkProfileObserver* observer) { |
66 observers_.RemoveObserver(observer); | 68 observers_.RemoveObserver(observer); |
67 } | 69 } |
68 | 70 |
69 void NetworkProfileHandler::GetManagerPropertiesCallback( | 71 void NetworkProfileHandler::GetManagerPropertiesCallback( |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback, | 215 base::Bind(&NetworkProfileHandler::GetManagerPropertiesCallback, |
214 weak_ptr_factory_.GetWeakPtr())); | 216 weak_ptr_factory_.GetWeakPtr())); |
215 } | 217 } |
216 | 218 |
217 NetworkProfileHandler::~NetworkProfileHandler() { | 219 NetworkProfileHandler::~NetworkProfileHandler() { |
218 DBusThreadManager::Get()->GetShillManagerClient()-> | 220 DBusThreadManager::Get()->GetShillManagerClient()-> |
219 RemovePropertyChangedObserver(this); | 221 RemovePropertyChangedObserver(this); |
220 } | 222 } |
221 | 223 |
222 } // namespace chromeos | 224 } // namespace chromeos |
OLD | NEW |