chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc - Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1"

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/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1" (Closed)

Patch Set: Created 3 years, 9 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/ui/screen_capture_notification_ui_chromeos.cc ('k') | chrome/browser/extensions/api/hotword_private/hotword_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

index d16a80cc2f228202cf7749c5c36586792f16dc5a..840f60d3f204c7c3f67b69f7fb805a53e4c70c6b 100644

--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc

@@ -53,7 +53,7 @@

#include "ui/gfx/range/range.h"

#if defined(OS_CHROMEOS)

-#include "ash/system/devicetype_utils.h"

+#include "ash/common/system/chromeos/devicetype_utils.h"

#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"

#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"

#include "components/user_manager/user.h"