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

Side by Side Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h

Issue 2534433002: Mop up incorrect uses of IsEnterpriseManaged() (Closed)
Patch Set: Address Roman's comment Created 4 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 scoped_refptr<net::URLRequestContextGetter> request_context) override; 62 scoped_refptr<net::URLRequestContextGetter> request_context) override;
63 63
64 // Shutdown() is called from BrowserProcessImpl::StartTearDown() but |this| 64 // Shutdown() is called from BrowserProcessImpl::StartTearDown() but |this|
65 // observes some objects that get destroyed earlier. PreShutdown() is called 65 // observes some objects that get destroyed earlier. PreShutdown() is called
66 // from ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun(), allowing the 66 // from ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun(), allowing the
67 // connection to these dependencies to be severed earlier. 67 // connection to these dependencies to be severed earlier.
68 void PreShutdown(); 68 void PreShutdown();
69 69
70 void Shutdown() override; 70 void Shutdown() override;
71 71
72 // Returns true if this device is managed by an enterprise (as opposed to 72 // Checks whether this devices is under any kind of enterprise management.
73 // a local owner).
74 bool IsEnterpriseManaged() const; 73 bool IsEnterpriseManaged() const;
75 74
75 // Checks whether this is a cloud (DM server) managed enterprise device.
76 bool IsCloudManaged() const;
77
78 // Checks whether this is an Active Directory managed enterprise device.
79 bool IsActiveDirectoryManaged() const;
80
76 // Returns the enterprise domain if device is managed. 81 // Returns the enterprise domain if device is managed.
77 std::string GetEnterpriseDomain() const; 82 std::string GetEnterpriseDomain() const;
78 83
79 // Returns the Kerberos realm (aka Windows Domain) if the device is managed by 84 // Returns the Kerberos realm (aka Windows Domain) if the device is managed by
80 // Active Directory. 85 // Active Directory.
81 std::string GetRealm() const; 86 std::string GetRealm() const;
82 87
83 // Returns the device asset ID if it is set. 88 // Returns the device asset ID if it is set.
84 std::string GetDeviceAssetID() const; 89 std::string GetDeviceAssetID() const;
85 90
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 std::unique_ptr<NetworkConfigurationUpdater> network_configuration_updater_; 207 std::unique_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
203 208
204 base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_; 209 base::WeakPtrFactory<BrowserPolicyConnectorChromeOS> weak_ptr_factory_;
205 210
206 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnectorChromeOS); 211 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnectorChromeOS);
207 }; 212 };
208 213
209 } // namespace policy 214 } // namespace policy
210 215
211 #endif // CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_ 216 #endif // CHROME_BROWSER_CHROMEOS_POLICY_BROWSER_POLICY_CONNECTOR_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698