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

Side by Side Diff: chrome/browser/chromeos/settings/device_settings_provider.cc

Issue 29263007: linux and chromeos: Turn on -Wunused-const-variable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 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 unified diff | Download patch
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 #include "chrome/browser/chromeos/settings/device_settings_provider.h" 5 #include "chrome/browser/chromeos/settings/device_settings_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 kSignedDataRoamingEnabled, 75 kSignedDataRoamingEnabled,
76 kStartUpFlags, 76 kStartUpFlags,
77 kStartUpUrls, 77 kStartUpUrls,
78 kStatsReportingPref, 78 kStatsReportingPref,
79 kSystemTimezonePolicy, 79 kSystemTimezonePolicy,
80 kSystemUse24HourClock, 80 kSystemUse24HourClock,
81 kUpdateDisabled, 81 kUpdateDisabled,
82 kVariationsRestrictParameter, 82 kVariationsRestrictParameter,
83 }; 83 };
84 84
85 // Legacy policy file location. Used to detect migration from pre v12 ChromeOS.
86 const char kLegacyPolicyFile[] = "/var/lib/whitelist/preferences";
87
88 bool HasOldMetricsFile() { 85 bool HasOldMetricsFile() {
89 // TODO(pastarmovj): Remove this once migration is not needed anymore. 86 // TODO(pastarmovj): Remove this once migration is not needed anymore.
90 // If the value is not set we should try to migrate legacy consent file. 87 // If the value is not set we should try to migrate legacy consent file.
91 // Loading consent file state causes us to do blocking IO on UI thread. 88 // Loading consent file state causes us to do blocking IO on UI thread.
92 // Temporarily allow it until we fix http://crbug.com/62626 89 // Temporarily allow it until we fix http://crbug.com/62626
93 base::ThreadRestrictions::ScopedAllowIO allow_io; 90 base::ThreadRestrictions::ScopedAllowIO allow_io;
94 return GoogleUpdateSettings::GetCollectStatsConsent(); 91 return GoogleUpdateSettings::GetCollectStatsConsent();
95 } 92 }
96 93
97 void LogShillError( 94 void LogShillError(
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 void DeviceSettingsProvider::AttemptMigration() { 1003 void DeviceSettingsProvider::AttemptMigration() {
1007 if (device_settings_service_->HasPrivateOwnerKey()) { 1004 if (device_settings_service_->HasPrivateOwnerKey()) {
1008 PrefValueMap::const_iterator i; 1005 PrefValueMap::const_iterator i;
1009 for (i = migration_values_.begin(); i != migration_values_.end(); ++i) 1006 for (i = migration_values_.begin(); i != migration_values_.end(); ++i)
1010 DoSet(i->first, *i->second); 1007 DoSet(i->first, *i->second);
1011 migration_values_.Clear(); 1008 migration_values_.Clear();
1012 } 1009 }
1013 } 1010 }
1014 1011
1015 } // namespace chromeos 1012 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/vpn_config_view.cc ('k') | chrome/browser/chromeos/status/data_promo_notification.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698