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

Side by Side Diff: chrome/browser/renderer_host/pepper/device_id_fetcher.cc

Issue 1102733002: Remove most occurences of PrefRegistrySyncable::UNSYNCABLE_PREF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs-add-reg-funcs
Patch Set: Created 5 years, 8 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) 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/files/file_util.h" 7 #include "base/files/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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 BrowserThread::PostTask( 73 BrowserThread::PostTask(
74 BrowserThread::UI, 74 BrowserThread::UI,
75 FROM_HERE, 75 FROM_HERE,
76 base::Bind(&DeviceIDFetcher::CheckPrefsOnUIThread, this)); 76 base::Bind(&DeviceIDFetcher::CheckPrefsOnUIThread, this));
77 return true; 77 return true;
78 } 78 }
79 79
80 // static 80 // static
81 void DeviceIDFetcher::RegisterProfilePrefs( 81 void DeviceIDFetcher::RegisterProfilePrefs(
82 user_prefs::PrefRegistrySyncable* prefs) { 82 user_prefs::PrefRegistrySyncable* prefs) {
83 prefs->RegisterBooleanPref(prefs::kEnableDRM, 83 prefs->RegisterBooleanPref(prefs::kEnableDRM, true);
84 true, 84 prefs->RegisterStringPref(prefs::kDRMSalt, "");
85 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
86 prefs->RegisterStringPref(
87 prefs::kDRMSalt, "", user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
88 } 85 }
89 86
90 // static 87 // static
91 base::FilePath DeviceIDFetcher::GetLegacyDeviceIDPath( 88 base::FilePath DeviceIDFetcher::GetLegacyDeviceIDPath(
92 const base::FilePath& profile_path) { 89 const base::FilePath& profile_path) {
93 return profile_path.AppendASCII(kDRMIdentifierFile); 90 return profile_path.AppendASCII(kDRMIdentifierFile);
94 } 91 }
95 92
96 void DeviceIDFetcher::CheckPrefsOnUIThread() { 93 void DeviceIDFetcher::CheckPrefsOnUIThread() {
97 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 94 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 BrowserThread::IO, 203 BrowserThread::IO,
207 FROM_HERE, 204 FROM_HERE,
208 base::Bind(&DeviceIDFetcher::RunCallbackOnIOThread, this, id, result)); 205 base::Bind(&DeviceIDFetcher::RunCallbackOnIOThread, this, id, result));
209 return; 206 return;
210 } 207 }
211 in_progress_ = false; 208 in_progress_ = false;
212 callback_.Run(id, result); 209 callback_.Run(id, result);
213 } 210 }
214 211
215 } // namespace chrome 212 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/push_messaging/push_messaging_service_impl.cc ('k') | chrome/browser/search/hotword_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698