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

Side by Side Diff: chromeos/network/device_state.h

Issue 238433003: Provide Shill IP Address to myIpAddress() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + feedback Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/chromeos.gyp ('k') | chromeos/network/host_resolver_impl_chromeos.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CHROMEOS_NETWORK_DEVICE_STATE_H_ 5 #ifndef CHROMEOS_NETWORK_DEVICE_STATE_H_
6 #define CHROMEOS_NETWORK_DEVICE_STATE_H_ 6 #define CHROMEOS_NETWORK_DEVICE_STATE_H_
7 7
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chromeos/network/managed_state.h" 9 #include "chromeos/network/managed_state.h"
10 #include "chromeos/network/network_util.h" 10 #include "chromeos/network/network_util.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 const std::string& carrier() const { return carrier_; } 42 const std::string& carrier() const { return carrier_; }
43 const std::string& sim_lock_type() const { return sim_lock_type_; } 43 const std::string& sim_lock_type() const { return sim_lock_type_; }
44 uint32 sim_retries_left() const { return sim_retries_left_; } 44 uint32 sim_retries_left() const { return sim_retries_left_; }
45 bool sim_lock_enabled() const { return sim_lock_enabled_; } 45 bool sim_lock_enabled() const { return sim_lock_enabled_; }
46 const std::string& meid() const { return meid_; } 46 const std::string& meid() const { return meid_; }
47 const std::string& imei() const { return imei_; } 47 const std::string& imei() const { return imei_; }
48 const std::string& iccid() const { return iccid_; } 48 const std::string& iccid() const { return iccid_; }
49 const std::string& mdn() const { return mdn_; } 49 const std::string& mdn() const { return mdn_; }
50 const CellularScanResults& scan_results() const { return scan_results_; } 50 const CellularScanResults& scan_results() const { return scan_results_; }
51 51
52 // |ip_configs_| is kept up to date by NetworkStateHandler.
53 const base::DictionaryValue& ip_configs() const { return ip_configs_; }
54
52 // Do not use this. It exists temporarily for internet_options_handler.cc 55 // Do not use this. It exists temporarily for internet_options_handler.cc
53 // which is being deprecated. 56 // which is being deprecated.
54 const base::DictionaryValue& properties() const { return properties_; } 57 const base::DictionaryValue& properties() const { return properties_; }
55 const base::DictionaryValue& ip_configs() const { return ip_configs_; }
56 58
57 // Ethernet specific accessors 59 // Ethernet specific accessors
58 bool eap_authentication_completed() const { 60 bool eap_authentication_completed() const {
59 return eap_authentication_completed_; 61 return eap_authentication_completed_;
60 } 62 }
61 63
62 // Returns true if the technology family is GSM and sim_present_ is false. 64 // Returns true if the technology family is GSM and sim_present_ is false.
63 bool IsSimAbsent() const; 65 bool IsSimAbsent() const;
64 66
65 private: 67 private:
(...skipping 26 matching lines...) Expand all
92 94
93 // Dictionary of IPConfig properties, keyed by IpConfig path. 95 // Dictionary of IPConfig properties, keyed by IpConfig path.
94 base::DictionaryValue ip_configs_; 96 base::DictionaryValue ip_configs_;
95 97
96 DISALLOW_COPY_AND_ASSIGN(DeviceState); 98 DISALLOW_COPY_AND_ASSIGN(DeviceState);
97 }; 99 };
98 100
99 } // namespace chromeos 101 } // namespace chromeos
100 102
101 #endif // CHROMEOS_NETWORK_DEVICE_STATE_H_ 103 #endif // CHROMEOS_NETWORK_DEVICE_STATE_H_
OLDNEW
« no previous file with comments | « chromeos/chromeos.gyp ('k') | chromeos/network/host_resolver_impl_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698