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

Side by Side Diff: chrome/browser/policy/enterprise_install_attributes.h

Issue 10443125: Allow re-enrollment to the same domain in case of policy data loss. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments and fixed some small issues. Created 8 years, 6 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_ 5 #ifndef CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_
6 #define CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_ 6 #define CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 // Gets the device id that was generated when the device was registered. 53 // Gets the device id that was generated when the device was registered.
54 // Returns an empty string if the device is not an enterprise device or the 54 // Returns an empty string if the device is not an enterprise device or the
55 // device id was not stored in the lockbox (prior to R19). 55 // device id was not stored in the lockbox (prior to R19).
56 std::string GetDeviceId(); 56 std::string GetDeviceId();
57 57
58 // Gets the mode the device was enrolled to. The return value for devices that 58 // Gets the mode the device was enrolled to. The return value for devices that
59 // are not locked yet will be DEVICE_MODE_UNKNOWN. 59 // are not locked yet will be DEVICE_MODE_UNKNOWN.
60 DeviceMode GetMode(); 60 DeviceMode GetMode();
61 61
62 // Extract the domain from the given email.
63 static std::string ExtractDomainName(const std::string& email);
Mattias Nissler (ping if slow) 2012/06/08 12:06:11 This should go into Authenticator, which already h
pastarmovj 2012/06/08 12:56:39 Done.
64
62 private: 65 private:
63 // Makes sure the local caches for enterprise-related install attributes are 66 // Makes sure the local caches for enterprise-related install attributes are
64 // up-to-date with what cryptohome has. 67 // up-to-date with what cryptohome has.
65 void ReadImmutableAttributes(); 68 void ReadImmutableAttributes();
66 69
67 chromeos::CryptohomeLibrary* cryptohome_; 70 chromeos::CryptohomeLibrary* cryptohome_;
68 71
69 bool device_locked_; 72 bool device_locked_;
70 std::string registration_user_; 73 std::string registration_user_;
71 std::string registration_domain_; 74 std::string registration_domain_;
72 std::string registration_device_id_; 75 std::string registration_device_id_;
73 DeviceMode registration_mode_; 76 DeviceMode registration_mode_;
74 77
75 DISALLOW_COPY_AND_ASSIGN(EnterpriseInstallAttributes); 78 DISALLOW_COPY_AND_ASSIGN(EnterpriseInstallAttributes);
76 }; 79 };
77 80
78 } // namespace policy 81 } // namespace policy
79 82
80 #endif // CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_ 83 #endif // CHROME_BROWSER_POLICY_ENTERPRISE_INSTALL_ATTRIBUTES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698