diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 21:11:13 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-17 21:11:13 +0000 |
| commit | 1f9fa30cbcd681928e28c6e7085da643b50c6acb (patch) | |
| tree | 49c2024f60af6406d5a1598bf4547580b78441d7 /chromeos/dbus | |
| parent | ffd49dfc0729301c77dcf5026d29fa9cbedaecc1 (diff) | |
| download | chromium_src-1f9fa30cbcd681928e28c6e7085da643b50c6acb.zip chromium_src-1f9fa30cbcd681928e28c6e7085da643b50c6acb.tar.gz chromium_src-1f9fa30cbcd681928e28c6e7085da643b50c6acb.tar.bz2 | |
Handle NetworkConnectionHandler errors in NetworkStateListDetailedView
Explicitly handle different error types in NetworkStateListDetailedView
with NetworkConnectionHandler enabled.
Modifies the SystemTrayDelegate interface for new Handler code in
preparation of removing old code.
BUG=235243
R=gspencer@chromium.org
Review URL: https://codereview.chromium.org/14762016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus')
| -rw-r--r-- | chromeos/dbus/shill_service_client_stub.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc index 434c4ce..af4245c 100644 --- a/chromeos/dbus/shill_service_client_stub.cc +++ b/chromeos/dbus/shill_service_client_stub.cc @@ -355,53 +355,53 @@ void ShillServiceClientStub::SetDefaultProperties() { if (!CommandLine::ForCurrentProcess()->HasSwitch( chromeos::switches::kDisableStubEthernet)) { - AddService("stub_ethernet", "eth0", + AddService("eth1", "eth1", flimflam::kTypeEthernet, flimflam::kStateOnline, add_to_watchlist); } - AddService("stub_wifi1", "wifi1", + AddService("wifi1", "wifi1", flimflam::kTypeWifi, flimflam::kStateOnline, add_to_watchlist); - SetServiceProperty("stub_wifi1", + SetServiceProperty("wifi1", flimflam::kSecurityProperty, base::StringValue(flimflam::kSecurityWep)); - AddService("stub_wifi2", "wifi2_PSK", + AddService("wifi2", "wifi2_PSK", flimflam::kTypeWifi, flimflam::kStateIdle, add_to_watchlist); - SetServiceProperty("stub_wifi2", + SetServiceProperty("wifi2", flimflam::kSecurityProperty, base::StringValue(flimflam::kSecurityPsk)); base::FundamentalValue strength_value(80); - SetServiceProperty("stub_wifi2", + SetServiceProperty("wifi2", flimflam::kSignalStrengthProperty, strength_value); - AddService("stub_cellular1", "cellular1", + AddService("cellular1", "cellular1", flimflam::kTypeCellular, flimflam::kStateIdle, add_to_watchlist); base::StringValue technology_value(flimflam::kNetworkTechnologyGsm); - SetServiceProperty("stub_cellular1", + SetServiceProperty("cellular1", flimflam::kNetworkTechnologyProperty, technology_value); - SetServiceProperty("stub_cellular1", + SetServiceProperty("cellular1", flimflam::kActivationStateProperty, base::StringValue(flimflam::kActivationStateNotActivated)); - SetServiceProperty("stub_cellular1", + SetServiceProperty("cellular1", flimflam::kRoamingStateProperty, base::StringValue(flimflam::kRoamingStateHome)); - AddService("stub_vpn1", "vpn1", + AddService("vpn1", "vpn1", flimflam::kTypeVPN, flimflam::kStateOnline, add_to_watchlist); - AddService("stub_vpn2", "vpn2", + AddService("vpn2", "vpn2", flimflam::kTypeVPN, flimflam::kStateOffline, add_to_watchlist); |