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

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

Issue 398753004: [cros] Move User class to user_manager component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 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.h" 5 #include "chrome/browser/chromeos/policy/user_network_configuration_updater.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/chromeos/login/users/user.h"
13 #include "chrome/browser/chromeos/net/onc_utils.h" 12 #include "chrome/browser/chromeos/net/onc_utils.h"
14 #include "chrome/browser/net/nss_context.h" 13 #include "chrome/browser/net/nss_context.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chromeos/network/managed_network_configuration_handler.h" 15 #include "chromeos/network/managed_network_configuration_handler.h"
17 #include "chromeos/network/onc/onc_certificate_importer_impl.h" 16 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
17 #include "components/user_manager/user.h"
18 #include "content/public/browser/notification_source.h" 18 #include "content/public/browser/notification_source.h"
19 #include "net/cert/x509_certificate.h" 19 #include "net/cert/x509_certificate.h"
20 #include "policy/policy_constants.h" 20 #include "policy/policy_constants.h"
21 21
22 namespace policy { 22 namespace policy {
23 23
24 UserNetworkConfigurationUpdater::~UserNetworkConfigurationUpdater() {} 24 UserNetworkConfigurationUpdater::~UserNetworkConfigurationUpdater() {}
25 25
26 // static 26 // static
27 scoped_ptr<UserNetworkConfigurationUpdater> 27 scoped_ptr<UserNetworkConfigurationUpdater>
28 UserNetworkConfigurationUpdater::CreateForUserPolicy( 28 UserNetworkConfigurationUpdater::CreateForUserPolicy(
29 Profile* profile, 29 Profile* profile,
30 bool allow_trusted_certs_from_policy, 30 bool allow_trusted_certs_from_policy,
31 const chromeos::User& user, 31 const user_manager::User& user,
32 PolicyService* policy_service, 32 PolicyService* policy_service,
33 chromeos::ManagedNetworkConfigurationHandler* network_config_handler) { 33 chromeos::ManagedNetworkConfigurationHandler* network_config_handler) {
34 scoped_ptr<UserNetworkConfigurationUpdater> updater( 34 scoped_ptr<UserNetworkConfigurationUpdater> updater(
35 new UserNetworkConfigurationUpdater(profile, 35 new UserNetworkConfigurationUpdater(profile,
36 allow_trusted_certs_from_policy, 36 allow_trusted_certs_from_policy,
37 user, 37 user,
38 policy_service, 38 policy_service,
39 network_config_handler)); 39 network_config_handler));
40 updater->Init(); 40 updater->Init();
41 return updater.Pass(); 41 return updater.Pass();
42 } 42 }
43 43
44 void UserNetworkConfigurationUpdater::AddTrustedCertsObserver( 44 void UserNetworkConfigurationUpdater::AddTrustedCertsObserver(
45 WebTrustedCertsObserver* observer) { 45 WebTrustedCertsObserver* observer) {
46 observer_list_.AddObserver(observer); 46 observer_list_.AddObserver(observer);
47 } 47 }
48 48
49 void UserNetworkConfigurationUpdater::RemoveTrustedCertsObserver( 49 void UserNetworkConfigurationUpdater::RemoveTrustedCertsObserver(
50 WebTrustedCertsObserver* observer) { 50 WebTrustedCertsObserver* observer) {
51 observer_list_.RemoveObserver(observer); 51 observer_list_.RemoveObserver(observer);
52 } 52 }
53 53
54 UserNetworkConfigurationUpdater::UserNetworkConfigurationUpdater( 54 UserNetworkConfigurationUpdater::UserNetworkConfigurationUpdater(
55 Profile* profile, 55 Profile* profile,
56 bool allow_trusted_certs_from_policy, 56 bool allow_trusted_certs_from_policy,
57 const chromeos::User& user, 57 const user_manager::User& user,
58 PolicyService* policy_service, 58 PolicyService* policy_service,
59 chromeos::ManagedNetworkConfigurationHandler* network_config_handler) 59 chromeos::ManagedNetworkConfigurationHandler* network_config_handler)
60 : NetworkConfigurationUpdater(onc::ONC_SOURCE_USER_POLICY, 60 : NetworkConfigurationUpdater(onc::ONC_SOURCE_USER_POLICY,
61 key::kOpenNetworkConfiguration, 61 key::kOpenNetworkConfiguration,
62 policy_service, 62 policy_service,
63 network_config_handler), 63 network_config_handler),
64 allow_trusted_certificates_from_policy_(allow_trusted_certs_from_policy), 64 allow_trusted_certificates_from_policy_(allow_trusted_certs_from_policy),
65 user_(&user), 65 user_(&user),
66 weak_factory_(this) { 66 weak_factory_(this) {
67 // The updater is created with |certificate_importer_| unset and is 67 // The updater is created with |certificate_importer_| unset and is
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 pending_certificates_onc_.reset(); 144 pending_certificates_onc_.reset();
145 } 145 }
146 146
147 void UserNetworkConfigurationUpdater::NotifyTrustAnchorsChanged() { 147 void UserNetworkConfigurationUpdater::NotifyTrustAnchorsChanged() {
148 FOR_EACH_OBSERVER(WebTrustedCertsObserver, 148 FOR_EACH_OBSERVER(WebTrustedCertsObserver,
149 observer_list_, 149 observer_list_,
150 OnTrustAnchorsChanged(web_trust_certs_)); 150 OnTrustAnchorsChanged(web_trust_certs_));
151 } 151 }
152 152
153 } // namespace policy 153 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698