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

Unified Diff: chrome/browser/chromeos/cros/network_library.h

Issue 11824046: Detect user initiated network connection failures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/cros/network_library.h
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 9bf521d512724a4c392a226cfb7ce34dd5f20201..1c707b95c2e59f7bc95f5904b1adb43e1a34d6bf 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -361,7 +361,10 @@ class Network {
bool connected() const { return IsConnectedState(state_); }
bool connecting_or_connected() const { return connecting() || connected(); }
// True when a user-initiated connection attempt is in progress
- bool connection_started() const { return connection_started_; }
+ bool connection_started() const {
+ return user_connect_state_ == USER_CONNECT_STARTED;
+ }
+ UserConnectState user_connect_state() const { return user_connect_state_; }
bool failed() const { return state_ == STATE_FAILURE; }
bool disconnected() const { return IsDisconnectedState(state_); }
bool ready() const { return state_ == STATE_READY; }
@@ -562,7 +565,9 @@ class Network {
state_ = STATE_IDLE;
}
void set_connectable(bool connectable) { connectable_ = connectable; }
- void set_connection_started(bool started) { connection_started_ = started; }
+ void set_user_connect_state(UserConnectState user_connect_state) {
+ user_connect_state_ = user_connect_state;
+ }
void set_is_active(bool is_active) { is_active_ = is_active; }
void set_added(bool added) { added_ = added; }
void set_auto_connect(bool auto_connect) { auto_connect_ = auto_connect; }
@@ -601,7 +606,7 @@ class Network {
ConnectionState state_;
ConnectionError error_;
bool connectable_;
- bool connection_started_;
+ UserConnectState user_connect_state_;
bool is_active_;
int priority_; // determines order in network list.
bool auto_connect_;

Powered by Google App Engine
This is Rietveld 408576698