OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/renderer_host/pepper/device_id_fetcher.h" | 5 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 | 58 |
59 BrowserThread::PostTask( | 59 BrowserThread::PostTask( |
60 BrowserThread::UI, FROM_HERE, | 60 BrowserThread::UI, FROM_HERE, |
61 base::Bind(&DeviceIDFetcher::CheckPrefsOnUIThread, this)); | 61 base::Bind(&DeviceIDFetcher::CheckPrefsOnUIThread, this)); |
62 return true; | 62 return true; |
63 } | 63 } |
64 | 64 |
65 // static | 65 // static |
66 void DeviceIDFetcher::RegisterProfilePrefs( | 66 void DeviceIDFetcher::RegisterProfilePrefs( |
67 user_prefs::PrefRegistrySyncable* prefs) { | 67 user_prefs::PrefRegistrySyncable* prefs) { |
68 // TODO(wad): Once UI is connected, a final default can be set. At that point | |
69 // change this pref from UNSYNCABLE to SYNCABLE. | |
70 prefs->RegisterBooleanPref(prefs::kEnableDRM, | 68 prefs->RegisterBooleanPref(prefs::kEnableDRM, |
71 true, | 69 true, |
72 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 70 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
73 prefs->RegisterStringPref( | 71 prefs->RegisterStringPref( |
74 prefs::kDRMSalt, | 72 prefs::kDRMSalt, |
75 "", | 73 "", |
76 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 74 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
77 } | 75 } |
78 | 76 |
79 // static | 77 // static |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 chromeos::CryptohomeLibrary* c_home = chromeos::CryptohomeLibrary::Get(); | 198 chromeos::CryptohomeLibrary* c_home = chromeos::CryptohomeLibrary::Get(); |
201 return c_home->GetSystemSalt(); | 199 return c_home->GetSystemSalt(); |
202 #else | 200 #else |
203 // Not implemented for other platforms. | 201 // Not implemented for other platforms. |
204 NOTREACHED(); | 202 NOTREACHED(); |
205 return ""; | 203 return ""; |
206 #endif | 204 #endif |
207 } | 205 } |
208 | 206 |
209 } // namespace chrome | 207 } // namespace chrome |
OLD | NEW |