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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browsing_data/browsing_data_remover.h" 5 #include "chrome/browser/browsing_data/browsing_data_remover.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 #include "chrome/browser/android/webapps/webapp_registry.h" 81 #include "chrome/browser/android/webapps/webapp_registry.h"
82 #include "chrome/browser/precache/precache_manager_factory.h" 82 #include "chrome/browser/precache/precache_manager_factory.h"
83 #include "components/offline_pages/offline_page_feature.h" 83 #include "components/offline_pages/offline_page_feature.h"
84 #include "components/offline_pages/offline_page_model.h" 84 #include "components/offline_pages/offline_page_model.h"
85 #include "components/precache/content/precache_manager.h" 85 #include "components/precache/content/precache_manager.h"
86 #endif 86 #endif
87 87
88 #if defined(OS_CHROMEOS) 88 #if defined(OS_CHROMEOS)
89 #include "chrome/browser/chromeos/profiles/profile_helper.h" 89 #include "chrome/browser/chromeos/profiles/profile_helper.h"
90 #include "chromeos/attestation/attestation_constants.h" 90 #include "chromeos/attestation/attestation_constants.h"
91 #include "chromeos/cryptohome/cryptohome_parameters.h"
91 #include "chromeos/dbus/cryptohome_client.h" 92 #include "chromeos/dbus/cryptohome_client.h"
92 #include "chromeos/dbus/dbus_thread_manager.h" 93 #include "chromeos/dbus/dbus_thread_manager.h"
93 #include "components/user_manager/user.h" 94 #include "components/user_manager/user.h"
94 #endif 95 #endif
95 96
96 #if defined(ENABLE_EXTENSIONS) 97 #if defined(ENABLE_EXTENSIONS)
97 #include "chrome/browser/extensions/activity_log/activity_log.h" 98 #include "chrome/browser/extensions/activity_log/activity_log.h"
98 #include "extensions/browser/extension_prefs.h" 99 #include "extensions/browser/extension_prefs.h"
99 #endif 100 #endif
100 101
(...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 #if defined(OS_CHROMEOS) 846 #if defined(OS_CHROMEOS)
846 // On Chrome OS, also delete any content protection platform keys. 847 // On Chrome OS, also delete any content protection platform keys.
847 const user_manager::User* user = 848 const user_manager::User* user =
848 chromeos::ProfileHelper::Get()->GetUserByProfile(profile_); 849 chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
849 if (!user) { 850 if (!user) {
850 LOG(WARNING) << "Failed to find user for current profile."; 851 LOG(WARNING) << "Failed to find user for current profile.";
851 } else { 852 } else {
852 chromeos::DBusThreadManager::Get() 853 chromeos::DBusThreadManager::Get()
853 ->GetCryptohomeClient() 854 ->GetCryptohomeClient()
854 ->TpmAttestationDeleteKeys( 855 ->TpmAttestationDeleteKeys(
855 chromeos::attestation::KEY_USER, user->email(), 856 chromeos::attestation::KEY_USER,
857 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.
856 chromeos::attestation::kContentProtectionKeyPrefix, 858 chromeos::attestation::kContentProtectionKeyPrefix,
857 base::Bind(&BrowsingDataRemover::OnClearPlatformKeys, 859 base::Bind(&BrowsingDataRemover::OnClearPlatformKeys,
858 weak_ptr_factory_.GetWeakPtr())); 860 weak_ptr_factory_.GetWeakPtr()));
859 waiting_for_clear_platform_keys_ = true; 861 waiting_for_clear_platform_keys_ = true;
860 } 862 }
861 #endif 863 #endif
862 } 864 }
863 #endif 865 #endif
864 866
865 // Remove omnibox zero-suggest cache results. 867 // Remove omnibox zero-suggest cache results.
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 waiting_for_clear_domain_reliability_monitor_ = false; 1190 waiting_for_clear_domain_reliability_monitor_ = false;
1189 NotifyIfDone(); 1191 NotifyIfDone();
1190 } 1192 }
1191 1193
1192 // static 1194 // static
1193 BrowsingDataRemover::CallbackSubscription 1195 BrowsingDataRemover::CallbackSubscription
1194 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback( 1196 BrowsingDataRemover::RegisterOnBrowsingDataRemovedCallback(
1195 const BrowsingDataRemover::Callback& callback) { 1197 const BrowsingDataRemover::Callback& callback) {
1196 return GetOnBrowsingDataRemovedCallbacks()->Add(callback); 1198 return GetOnBrowsingDataRemovedCallbacks()->Add(callback);
1197 } 1199 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698