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

Side by Side Diff: chrome/browser/chromeos/net/network_change_notifier_chromeos.h

Issue 11360108: Start calculating new combined NetworkChangeNotifier signal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address szym's first round of comments Created 8 years 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_ 6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 // Updates the initial state. Lets us trigger initial eval of the 77 // Updates the initial state. Lets us trigger initial eval of the
78 // connectivity status without waiting for an event from the connection 78 // connectivity status without waiting for an event from the connection
79 // manager. 79 // manager.
80 static void UpdateInitialState(NetworkChangeNotifierChromeos* self); 80 static void UpdateInitialState(NetworkChangeNotifierChromeos* self);
81 81
82 // Gets connection type for given |network|. 82 // Gets connection type for given |network|.
83 static net::NetworkChangeNotifier::ConnectionType GetNetworkConnectionType( 83 static net::NetworkChangeNotifier::ConnectionType GetNetworkConnectionType(
84 const chromeos::Network* network); 84 const chromeos::Network* network);
85 85
86 // Get parameters for calculating new combined signal.
87 static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsChromeos();
88
86 // True if we previously had an active network around. 89 // True if we previously had an active network around.
87 bool has_active_network_; 90 bool has_active_network_;
88 // Current active network's connection state. 91 // Current active network's connection state.
89 chromeos::ConnectionState connection_state_; 92 chromeos::ConnectionState connection_state_;
90 // Current active network's connection type. 93 // Current active network's connection type.
91 net::NetworkChangeNotifier::ConnectionType connection_type_; 94 net::NetworkChangeNotifier::ConnectionType connection_type_;
92 // Current active network's service path. 95 // Current active network's service path.
93 std::string service_path_; 96 std::string service_path_;
94 // Current active network's IP address. 97 // Current active network's IP address.
95 std::string ip_address_; 98 std::string ip_address_;
96 // Current active network's name servers. 99 // Current active network's name servers.
97 std::vector<std::string> name_servers_; 100 std::vector<std::string> name_servers_;
98 101
99 scoped_ptr<DnsConfigServiceChromeos> dns_config_service_; 102 scoped_ptr<DnsConfigServiceChromeos> dns_config_service_;
100 103
101 base::WeakPtrFactory<NetworkChangeNotifierChromeos> weak_factory_; 104 base::WeakPtrFactory<NetworkChangeNotifierChromeos> weak_factory_;
102 105
103 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierChromeos); 106 DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierChromeos);
104 }; 107 };
105 108
106 } // namespace chromeos 109 } // namespace chromeos
107 110
108 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_ 111 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698