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

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

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Final rebase to ToT before hitting the CQ. Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/cros_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e9e3206068fb56c58abd722e92c18e614998cad0..fd2c9c20c1ca0a6ed2738fbcc7a591a3ab4be285 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -27,12 +27,12 @@
#include "base/utf_string_conversion_utils.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "chrome/browser/chromeos/cros_settings.h"
#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/cros/onc_network_parser.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/public/browser/browser_thread.h"
#include "crypto/nss_util.h" // crypto::GetTPMTokenInfo() for 802.1X and VPN.
@@ -3589,9 +3589,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;
@@ -4670,9 +4671,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);
}
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/chromeos/cros_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698