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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/macros.h" 8 #include "base/macros.h"
9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
11 #include "build/build_config.h" 10 #include "build/build_config.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
13 #include "components/prefs/pref_service.h"
14 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
15 #include "chromeos/cryptohome/system_salt_getter.h" 15 #include "chromeos/cryptohome/system_salt_getter.h"
16 #endif 16 #endif
17 #include "components/pref_registry/pref_registry_syncable.h" 17 #include "components/pref_registry/pref_registry_syncable.h"
18 #include "content/public/browser/browser_context.h" 18 #include "content/public/browser/browser_context.h"
19 #include "content/public/browser/browser_ppapi_host.h" 19 #include "content/public/browser/browser_ppapi_host.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/browser/render_process_host.h" 21 #include "content/public/browser/render_process_host.h"
22 #include "crypto/encryptor.h" 22 #include "crypto/encryptor.h"
23 #include "crypto/random.h" 23 #include "crypto/random.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 BrowserThread::IO, 205 BrowserThread::IO,
206 FROM_HERE, 206 FROM_HERE,
207 base::Bind(&DeviceIDFetcher::RunCallbackOnIOThread, this, id, result)); 207 base::Bind(&DeviceIDFetcher::RunCallbackOnIOThread, this, id, result));
208 return; 208 return;
209 } 209 }
210 in_progress_ = false; 210 in_progress_ = false;
211 callback_.Run(id, result); 211 callback_.Run(id, result);
212 } 212 }
213 213
214 } // namespace chrome 214 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698