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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 2534433002: Mop up incorrect uses of IsEnterpriseManaged() (Closed)
Patch Set: Harmonize comments between InstallAttributes and BrowserPolicyConnectorChromeOS 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 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 const size_t kMaxUsers = 18; 67 const size_t kMaxUsers = 18;
68 68
69 const int kPasswordClearTimeoutSec = 60; 69 const int kPasswordClearTimeoutSec = 60;
70 70
71 void AddPublicSessionDetailsToUserDictionaryEntry( 71 void AddPublicSessionDetailsToUserDictionaryEntry(
72 base::DictionaryValue* user_dict, 72 base::DictionaryValue* user_dict,
73 const std::vector<std::string>* public_session_recommended_locales) { 73 const std::vector<std::string>* public_session_recommended_locales) {
74 policy::BrowserPolicyConnectorChromeOS* policy_connector = 74 policy::BrowserPolicyConnectorChromeOS* policy_connector =
75 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 75 g_browser_process->platform_part()->browser_policy_connector_chromeos();
76 76
77 if (policy_connector->IsEnterpriseManaged()) { 77 // Active Directory would require a different treatment, but it doesn't
achuithb 2016/11/25 10:10:48 I think this comment may be more confusing than cl
Thiemo Nagel 2016/11/25 14:26:10 OK. I've removed that comment.
78 // support Public Session anyways.
79 if (policy_connector->IsCloudManaged()) {
78 user_dict->SetString(kKeyEnterpriseDomain, 80 user_dict->SetString(kKeyEnterpriseDomain,
79 policy_connector->GetEnterpriseDomain()); 81 policy_connector->GetEnterpriseDomain());
80 } 82 }
81 83
82 std::vector<std::string> kEmptyRecommendedLocales; 84 std::vector<std::string> kEmptyRecommendedLocales;
83 const std::vector<std::string>& recommended_locales = 85 const std::vector<std::string>& recommended_locales =
84 public_session_recommended_locales ? 86 public_session_recommended_locales ?
85 *public_session_recommended_locales : kEmptyRecommendedLocales; 87 *public_session_recommended_locales : kEmptyRecommendedLocales;
86 88
87 // Construct the list of available locales. This list consists of the 89 // Construct the list of available locales. This list consists of the
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 // The user profile should exist if and only if this is the lock screen. 570 // The user profile should exist if and only if this is the lock screen.
569 DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN); 571 DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
570 572
571 if (!profile) 573 if (!profile)
572 profile = profile_helper->GetSigninProfile(); 574 profile = profile_helper->GetSigninProfile();
573 575
574 return EasyUnlockService::Get(profile); 576 return EasyUnlockService::Get(profile);
575 } 577 }
576 578
577 } // namespace chromeos 579 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698