Chromium Code Reviews| Index: chrome/browser/chromeos/cros/network_library.cc |
| diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc |
| index eb7516fab417ff2b5a6727065a39b1664ce5cae6..7b790f706da31d37cc2d6bac84093b0d626da5d6 100644 |
| --- a/chrome/browser/chromeos/cros/network_library.cc |
| +++ b/chrome/browser/chromeos/cros/network_library.cc |
| @@ -23,12 +23,12 @@ |
| #include "base/utf_string_conversions.h" |
| #include "base/utf_string_conversion_utils.h" |
| #include "base/values.h" |
| +#include "chrome/browser/chromeos/cros_settings.h" |
| +#include "chrome/browser/chromeos/network_login_observer.h" |
|
Denis Lagno
2011/09/20 14:05:22
nit: ASCII order
pastarmovj
2011/09/20 17:11:52
Done.
|
| #include "chrome/browser/chromeos/cros/cros_library.h" |
| #include "chrome/browser/chromeos/cros/native_network_constants.h" |
| #include "chrome/browser/chromeos/cros/native_network_parser.h" |
| #include "chrome/browser/chromeos/login/user_manager.h" |
| -#include "chrome/browser/chromeos/network_login_observer.h" |
| -#include "chrome/browser/chromeos/user_cros_settings_provider.h" |
| #include "chrome/common/time_format.h" |
| #include "content/browser/browser_thread.h" |
| #include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN. |
| @@ -3480,9 +3480,10 @@ void NetworkLibraryImplCros::UpdateNetworkDeviceStatus( |
| if (!device->data_roaming_allowed() && IsCellularAlwaysInRoaming()) { |
| SetCellularDataRoamingAllowed(true); |
| } else { |
| - bool settings_value = |
| - UserCrosSettingsProvider::cached_data_roaming_enabled(); |
| - if (device->data_roaming_allowed() != settings_value) { |
| + bool settings_value; |
| + if (CrosSettings::Get()->GetBoolean( |
| + kSignedDataRoamingEnabled, &settings_value) && |
| + device->data_roaming_allowed() != settings_value) { |
| // Switch back to signed settings value. |
| SetCellularDataRoamingAllowed(settings_value); |
| return; |
| @@ -4567,9 +4568,10 @@ void NetworkLibraryImplCros::ParseNetworkDevice(const std::string& device_path, |
| if (!device->data_roaming_allowed() && IsCellularAlwaysInRoaming()) { |
| SetCellularDataRoamingAllowed(true); |
| } else { |
| - bool settings_value = |
| - UserCrosSettingsProvider::cached_data_roaming_enabled(); |
| - if (device->data_roaming_allowed() != settings_value) { |
| + bool settings_value; |
| + if (CrosSettings::Get()->GetBoolean( |
| + kSignedDataRoamingEnabled, &settings_value) && |
| + device->data_roaming_allowed() != settings_value) { |
| // Switch back to signed settings value. |
| SetCellularDataRoamingAllowed(settings_value); |
| } |