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

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

Issue 3606005: Hooked mobile activation UI with the new libcros additions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 2 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
===================================================================
--- chrome/browser/chromeos/cros/network_library.h (revision 61908)
+++ chrome/browser/chromeos/cros/network_library.h (working copy)
@@ -23,6 +23,7 @@
const std::string& device_path() const { return device_path_; }
const std::string& ip_address() const { return ip_address_; }
ConnectionType type() const { return type_; }
+ ConnectionState connection_state() const { return state_; }
bool connecting() const { return state_ == STATE_ASSOCIATION ||
state_ == STATE_CONFIGURATION || state_ == STATE_CARRIER; }
bool connected() const { return state_ == STATE_READY; }
@@ -62,7 +63,7 @@
std::string device_path_;
std::string ip_address_;
ConnectionType type_;
- int state_;
+ ConnectionState state_;
ConnectionError error_;
};
@@ -129,8 +130,8 @@
const NetworkTechnology network_technology() const {
return network_technology_; }
const NetworkRoamingState roaming_state() const { return roaming_state_; }
- const std::string& operator_name() const { return payment_url_; }
- const std::string& operator_code() const { return payment_url_; }
+ const std::string& operator_name() const { return operator_name_; }
+ const std::string& operator_code() const { return operator_code_; }
const std::string& payment_url() const { return payment_url_; }
const std::string& meid() const { return meid_; }
const std::string& imei() const { return imei_; }

Powered by Google App Engine
This is Rietveld 408576698