chrome/browser/browsing_data/browsing_data_remover.cc - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

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/browsing_data/browsing_data_remover.cc

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add missing files. 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/browsing_data/browsing_data_remover.cc

diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc

index 685907cb44c6543f64d9dba51715189f02fdcfec..b6c4307fa2cca554691fa505c9db067c64d078ac 100644

--- a/chrome/browser/browsing_data/browsing_data_remover.cc

+++ b/chrome/browser/browsing_data/browsing_data_remover.cc

@@ -88,6 +88,7 @@

#if defined(OS_CHROMEOS)

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chromeos/attestation/attestation_constants.h"

+#include "chromeos/cryptohome/cryptohome_parameters.h"

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "components/user_manager/user.h"

@@ -852,7 +853,8 @@ void BrowsingDataRemover::RemoveImpl(const TimeRange& time_range,

chromeos::DBusThreadManager::Get()

->GetCryptohomeClient()

->TpmAttestationDeleteKeys(

- chromeos::attestation::KEY_USER, user->email(),

+ chromeos::attestation::KEY_USER,

+ cryptohome::Identification(user->GetAccountId()).id(),

Darren Krahn 2016/02/17 20:48:05 Moving cryptohome::Identification to chromeos/dbus

Alexander Alekseev 2016/02/18 13:45:14 Yes.

chromeos::attestation::kContentProtectionKeyPrefix,

base::Bind(&BrowsingDataRemover::OnClearPlatformKeys,

weak_ptr_factory_.GetWeakPtr()));

« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/kiosk_app_data.h » ('j') | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('J')