chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc - Issue 1658793002: Update chrome for new prefs location.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.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, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc

diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc

index bc2ac9d8c7ebcf40c4ab345165c40f5a213b9f2c..db3aa67e80a20e5a85b72051fd05294fb74a59fa 100644

--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc

@@ -14,9 +14,6 @@

#include "base/location.h"

#include "base/logging.h"

#include "base/memory/ref_counted.h"

-#include "base/prefs/pref_registry_simple.h"

-#include "base/prefs/pref_service.h"

-#include "base/prefs/scoped_user_pref_update.h"

#include "base/single_thread_task_runner.h"

#include "base/thread_task_runner_handle.h"

#include "base/threading/worker_pool.h"

@@ -24,6 +21,9 @@

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/common/pref_names.h"

+#include "components/prefs/pref_registry_simple.h"

+#include "components/prefs/pref_service.h"

+#include "components/prefs/scoped_user_pref_update.h"

#include "content/public/browser/browser_thread.h"

#include "crypto/nss_key_util.h"

#include "crypto/nss_util_internal.h"