OLD | NEW |
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 #ifndef UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ | 5 #ifndef UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ |
6 #define UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ | 6 #define UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ |
7 | 7 |
| 8 #include <memory> |
8 #include <set> | 9 #include <set> |
9 #include <string> | 10 #include <string> |
10 | 11 |
11 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "base/memory/weak_ptr.h" | 14 #include "base/memory/weak_ptr.h" |
15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
16 #include "chromeos/network/network_connection_observer.h" | 16 #include "chromeos/network/network_connection_observer.h" |
17 #include "chromeos/network/network_state_handler_observer.h" | 17 #include "chromeos/network/network_state_handler_observer.h" |
18 #include "ui/chromeos/ui_chromeos_export.h" | 18 #include "ui/chromeos/ui_chromeos_export.h" |
19 | 19 |
20 namespace base { | 20 namespace base { |
21 class DictionaryValue; | 21 class DictionaryValue; |
22 } | 22 } |
23 | 23 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 | 76 |
77 private: | 77 private: |
78 void ConnectErrorPropertiesSucceeded( | 78 void ConnectErrorPropertiesSucceeded( |
79 const std::string& error_name, | 79 const std::string& error_name, |
80 const std::string& service_path, | 80 const std::string& service_path, |
81 const base::DictionaryValue& shill_properties); | 81 const base::DictionaryValue& shill_properties); |
82 void ConnectErrorPropertiesFailed( | 82 void ConnectErrorPropertiesFailed( |
83 const std::string& error_name, | 83 const std::string& error_name, |
84 const std::string& service_path, | 84 const std::string& service_path, |
85 const std::string& shill_connect_error, | 85 const std::string& shill_connect_error, |
86 scoped_ptr<base::DictionaryValue> shill_error_data); | 86 std::unique_ptr<base::DictionaryValue> shill_error_data); |
87 void ShowConnectErrorNotification( | 87 void ShowConnectErrorNotification( |
88 const std::string& error_name, | 88 const std::string& error_name, |
89 const std::string& service_path, | 89 const std::string& service_path, |
90 const base::DictionaryValue& shill_properties); | 90 const base::DictionaryValue& shill_properties); |
91 void ShowVpnDisconnectedNotification(const chromeos::NetworkState* vpn); | 91 void ShowVpnDisconnectedNotification(const chromeos::NetworkState* vpn); |
92 | 92 |
93 // Removes any existing connect notifications. | 93 // Removes any existing connect notifications. |
94 void RemoveConnectNotification(); | 94 void RemoveConnectNotification(); |
95 | 95 |
96 // Returns true if the default network changed. | 96 // Returns true if the default network changed. |
(...skipping 14 matching lines...) Expand all Loading... |
111 std::set<std::string> cellular_activating_; | 111 std::set<std::string> cellular_activating_; |
112 std::string connected_vpn_; | 112 std::string connected_vpn_; |
113 base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_; | 113 base::WeakPtrFactory<NetworkStateNotifier> weak_ptr_factory_; |
114 | 114 |
115 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier); | 115 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifier); |
116 }; | 116 }; |
117 | 117 |
118 } // namespace ui | 118 } // namespace ui |
119 | 119 |
120 #endif // UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ | 120 #endif // UI_CHROMEOS_NETWORK_NETWORK_STATE_NOTIFIER_H_ |
OLD | NEW |