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

Side by Side Diff: chrome/browser/chromeos/policy/user_network_configuration_updater_factory.cc

Issue 898003002: [Cleanup] Const-correct the profile() method for the EasyUnlockService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/chromeos/policy/user_network_configuration_updater_fact ory.h" 5 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h" 8 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
9 #include "chrome/browser/chromeos/profiles/profile_helper.h" 9 #include "chrome/browser/chromeos/profiles/profile_helper.h"
10 #include "chrome/browser/policy/profile_policy_connector.h" 10 #include "chrome/browser/policy/profile_policy_connector.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 bool UserNetworkConfigurationUpdaterFactory::ServiceIsNULLWhileTesting() const { 57 bool UserNetworkConfigurationUpdaterFactory::ServiceIsNULLWhileTesting() const {
58 return true; 58 return true;
59 } 59 }
60 60
61 KeyedService* UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor( 61 KeyedService* UserNetworkConfigurationUpdaterFactory::BuildServiceInstanceFor(
62 content::BrowserContext* context) const { 62 content::BrowserContext* context) const {
63 Profile* profile = Profile::FromBrowserContext(context); 63 Profile* profile = Profile::FromBrowserContext(context);
64 if (chromeos::ProfileHelper::IsSigninProfile(profile)) 64 if (chromeos::ProfileHelper::IsSigninProfile(profile))
65 return NULL; // On the login screen only device network policies apply. 65 return NULL; // On the login screen only device network policies apply.
66 66
67 user_manager::User* user = 67 const user_manager::User* user =
68 chromeos::ProfileHelper::Get()->GetUserByProfile(profile); 68 chromeos::ProfileHelper::Get()->GetUserByProfile(profile);
69 DCHECK(user); 69 DCHECK(user);
70 // Currently, only the network policy of the primary user is supported. See 70 // Currently, only the network policy of the primary user is supported. See
71 // also http://crbug.com/310685 . 71 // also http://crbug.com/310685 .
72 if (user != user_manager::UserManager::Get()->GetPrimaryUser()) 72 if (user != user_manager::UserManager::Get()->GetPrimaryUser())
73 return NULL; 73 return NULL;
74 74
75 const bool allow_trusted_certs_from_policy = user->HasGaiaAccount(); 75 const bool allow_trusted_certs_from_policy = user->HasGaiaAccount();
76 76
77 ProfilePolicyConnector* profile_connector = 77 ProfilePolicyConnector* profile_connector =
78 ProfilePolicyConnectorFactory::GetForBrowserContext(context); 78 ProfilePolicyConnectorFactory::GetForBrowserContext(context);
79 79
80 return UserNetworkConfigurationUpdater::CreateForUserPolicy( 80 return UserNetworkConfigurationUpdater::CreateForUserPolicy(
81 profile, 81 profile,
82 allow_trusted_certs_from_policy, 82 allow_trusted_certs_from_policy,
83 *user, 83 *user,
84 profile_connector->policy_service(), 84 profile_connector->policy_service(),
85 chromeos::NetworkHandler::Get()->managed_network_configuration_handler()) 85 chromeos::NetworkHandler::Get()->managed_network_configuration_handler())
86 .release(); 86 .release();
87 } 87 }
88 88
89 } // namespace policy 89 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698