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

Side by Side Diff: chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc

Issue 2382833002: Rename policy::EnterpriseInstallAttributes to chromeos::InstallAttributes. (Closed)
Patch Set: Add missing #includes. Created 4 years, 2 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/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 5 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/base64.h" 10 #include "base/base64.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h" 16 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
17 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 17 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
18 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
19 #include "chrome/browser/chromeos/profiles/profile_helper.h" 18 #include "chrome/browser/chromeos/profiles/profile_helper.h"
20 #include "chrome/browser/chromeos/settings/cros_settings.h" 19 #include "chrome/browser/chromeos/settings/cros_settings.h"
20 #include "chrome/browser/chromeos/settings/install_attributes.h"
21 #include "chrome/browser/extensions/chrome_extension_function_details.h" 21 #include "chrome/browser/extensions/chrome_extension_function_details.h"
22 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/signin/signin_manager_factory.h" 23 #include "chrome/browser/signin/signin_manager_factory.h"
24 #include "chrome/common/extensions/api/enterprise_platform_keys_private.h" 24 #include "chrome/common/extensions/api/enterprise_platform_keys_private.h"
25 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
26 #include "chromeos/attestation/attestation_constants.h" 26 #include "chromeos/attestation/attestation_constants.h"
27 #include "chromeos/attestation/attestation_flow.h" 27 #include "chromeos/attestation/attestation_flow.h"
28 #include "chromeos/cryptohome/async_method_caller.h" 28 #include "chromeos/cryptohome/async_method_caller.h"
29 #include "chromeos/cryptohome/cryptohome_parameters.h" 29 #include "chromeos/cryptohome/cryptohome_parameters.h"
30 #include "chromeos/dbus/cryptohome_client.h" 30 #include "chromeos/dbus/cryptohome_client.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 new chromeos::attestation::AttestationCAClient()); 91 new chromeos::attestation::AttestationCAClient());
92 default_attestation_flow_.reset(new chromeos::attestation::AttestationFlow( 92 default_attestation_flow_.reset(new chromeos::attestation::AttestationFlow(
93 async_caller_, cryptohome_client_, std::move(ca_client))); 93 async_caller_, cryptohome_client_, std::move(ca_client)));
94 attestation_flow_ = default_attestation_flow_.get(); 94 attestation_flow_ = default_attestation_flow_.get();
95 } 95 }
96 96
97 EPKPChallengeKeyBase::EPKPChallengeKeyBase( 97 EPKPChallengeKeyBase::EPKPChallengeKeyBase(
98 chromeos::CryptohomeClient* cryptohome_client, 98 chromeos::CryptohomeClient* cryptohome_client,
99 cryptohome::AsyncMethodCaller* async_caller, 99 cryptohome::AsyncMethodCaller* async_caller,
100 chromeos::attestation::AttestationFlow* attestation_flow, 100 chromeos::attestation::AttestationFlow* attestation_flow,
101 policy::EnterpriseInstallAttributes* install_attributes) : 101 chromeos::InstallAttributes* install_attributes) :
102 cryptohome_client_(cryptohome_client), 102 cryptohome_client_(cryptohome_client),
103 async_caller_(async_caller), 103 async_caller_(async_caller),
104 attestation_flow_(attestation_flow), 104 attestation_flow_(attestation_flow),
105 install_attributes_(install_attributes) { 105 install_attributes_(install_attributes) {
106 } 106 }
107 107
108 EPKPChallengeKeyBase::~EPKPChallengeKeyBase() { 108 EPKPChallengeKeyBase::~EPKPChallengeKeyBase() {
109 } 109 }
110 110
111 void EPKPChallengeKeyBase::GetDeviceAttestationEnabled( 111 void EPKPChallengeKeyBase::GetDeviceAttestationEnabled(
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 292
293 const char EPKPChallengeMachineKey::kKeyName[] = "attest-ent-machine"; 293 const char EPKPChallengeMachineKey::kKeyName[] = "attest-ent-machine";
294 294
295 EPKPChallengeMachineKey::EPKPChallengeMachineKey() : EPKPChallengeKeyBase() { 295 EPKPChallengeMachineKey::EPKPChallengeMachineKey() : EPKPChallengeKeyBase() {
296 } 296 }
297 297
298 EPKPChallengeMachineKey::EPKPChallengeMachineKey( 298 EPKPChallengeMachineKey::EPKPChallengeMachineKey(
299 chromeos::CryptohomeClient* cryptohome_client, 299 chromeos::CryptohomeClient* cryptohome_client,
300 cryptohome::AsyncMethodCaller* async_caller, 300 cryptohome::AsyncMethodCaller* async_caller,
301 chromeos::attestation::AttestationFlow* attestation_flow, 301 chromeos::attestation::AttestationFlow* attestation_flow,
302 policy::EnterpriseInstallAttributes* install_attributes) : 302 chromeos::InstallAttributes* install_attributes) :
303 EPKPChallengeKeyBase(cryptohome_client, 303 EPKPChallengeKeyBase(cryptohome_client,
304 async_caller, 304 async_caller,
305 attestation_flow, 305 attestation_flow,
306 install_attributes) { 306 install_attributes) {
307 } 307 }
308 308
309 EPKPChallengeMachineKey::~EPKPChallengeMachineKey() { 309 EPKPChallengeMachineKey::~EPKPChallengeMachineKey() {
310 } 310 }
311 311
312 void EPKPChallengeMachineKey::Run( 312 void EPKPChallengeMachineKey::Run(
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 406
407 const char EPKPChallengeUserKey::kKeyName[] = "attest-ent-user"; 407 const char EPKPChallengeUserKey::kKeyName[] = "attest-ent-user";
408 408
409 EPKPChallengeUserKey::EPKPChallengeUserKey() : EPKPChallengeKeyBase() { 409 EPKPChallengeUserKey::EPKPChallengeUserKey() : EPKPChallengeKeyBase() {
410 } 410 }
411 411
412 EPKPChallengeUserKey::EPKPChallengeUserKey( 412 EPKPChallengeUserKey::EPKPChallengeUserKey(
413 chromeos::CryptohomeClient* cryptohome_client, 413 chromeos::CryptohomeClient* cryptohome_client,
414 cryptohome::AsyncMethodCaller* async_caller, 414 cryptohome::AsyncMethodCaller* async_caller,
415 chromeos::attestation::AttestationFlow* attestation_flow, 415 chromeos::attestation::AttestationFlow* attestation_flow,
416 policy::EnterpriseInstallAttributes* install_attributes) : 416 chromeos::InstallAttributes* install_attributes) :
417 EPKPChallengeKeyBase(cryptohome_client, 417 EPKPChallengeKeyBase(cryptohome_client,
418 async_caller, 418 async_caller,
419 attestation_flow, 419 attestation_flow,
420 install_attributes) { 420 install_attributes) {
421 } 421 }
422 422
423 EPKPChallengeUserKey::~EPKPChallengeUserKey() { 423 EPKPChallengeUserKey::~EPKPChallengeUserKey() {
424 } 424 }
425 425
426 void EPKPChallengeUserKey::RegisterProfilePrefs( 426 void EPKPChallengeUserKey::RegisterProfilePrefs(
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 std::string encoded_response; 634 std::string encoded_response;
635 base::Base64Encode(data, &encoded_response); 635 base::Base64Encode(data, &encoded_response);
636 Respond(ArgumentList( 636 Respond(ArgumentList(
637 api_epkp::ChallengeUserKey::Results::Create(encoded_response))); 637 api_epkp::ChallengeUserKey::Results::Create(encoded_response)));
638 } else { 638 } else {
639 Respond(Error(data)); 639 Respond(Error(data));
640 } 640 }
641 } 641 }
642 642
643 } // namespace extensions 643 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698