OLD | NEW |
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/supervised_user/supervised_user_service.h" | 5 #include "chrome/browser/supervised_user/supervised_user_service.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/feature_list.h" | 10 #include "base/feature_list.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" | 35 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" |
36 #include "chrome/browser/supervised_user/supervised_user_site_list.h" | 36 #include "chrome/browser/supervised_user/supervised_user_site_list.h" |
37 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 37 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
38 #include "chrome/browser/sync/profile_sync_service_factory.h" | 38 #include "chrome/browser/sync/profile_sync_service_factory.h" |
39 #include "chrome/browser/ui/browser.h" | 39 #include "chrome/browser/ui/browser.h" |
40 #include "chrome/browser/ui/browser_list.h" | 40 #include "chrome/browser/ui/browser_list.h" |
41 #include "chrome/common/chrome_paths.h" | 41 #include "chrome/common/chrome_paths.h" |
42 #include "chrome/common/chrome_switches.h" | 42 #include "chrome/common/chrome_switches.h" |
43 #include "chrome/common/pref_names.h" | 43 #include "chrome/common/pref_names.h" |
44 #include "chrome/grit/generated_resources.h" | 44 #include "chrome/grit/generated_resources.h" |
45 #include "components/browser_sync/browser/profile_sync_service.h" | 45 #include "components/browser_sync/profile_sync_service.h" |
46 #include "components/pref_registry/pref_registry_syncable.h" | 46 #include "components/pref_registry/pref_registry_syncable.h" |
47 #include "components/prefs/pref_service.h" | 47 #include "components/prefs/pref_service.h" |
48 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 48 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
49 #include "components/signin/core/browser/signin_manager.h" | 49 #include "components/signin/core/browser/signin_manager.h" |
50 #include "components/signin/core/browser/signin_manager_base.h" | 50 #include "components/signin/core/browser/signin_manager_base.h" |
51 #include "components/signin/core/common/signin_switches.h" | 51 #include "components/signin/core/common/signin_switches.h" |
52 #include "content/public/browser/browser_thread.h" | 52 #include "content/public/browser/browser_thread.h" |
53 #include "content/public/browser/user_metrics.h" | 53 #include "content/public/browser/user_metrics.h" |
54 #include "ui/base/l10n/l10n_util.h" | 54 #include "ui/base/l10n/l10n_util.h" |
55 | 55 |
(...skipping 1218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 content::RecordAction(UserMetricsAction("ManagedUsers_SwitchProfile")); | 1274 content::RecordAction(UserMetricsAction("ManagedUsers_SwitchProfile")); |
1275 | 1275 |
1276 is_profile_active_ = profile_became_active; | 1276 is_profile_active_ = profile_became_active; |
1277 } | 1277 } |
1278 #endif // !defined(OS_ANDROID) | 1278 #endif // !defined(OS_ANDROID) |
1279 | 1279 |
1280 void SupervisedUserService::OnSiteListUpdated() { | 1280 void SupervisedUserService::OnSiteListUpdated() { |
1281 FOR_EACH_OBSERVER( | 1281 FOR_EACH_OBSERVER( |
1282 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged()); | 1282 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged()); |
1283 } | 1283 } |
OLD | NEW |