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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 23 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
24 #include "chrome/browser/signin/signin_manager_factory.h" | 24 #include "chrome/browser/signin/signin_manager_factory.h" |
25 #include "chrome/browser/supervised_user/experimental/supervised_user_filtering_
switches.h" | 25 #include "chrome/browser/supervised_user/experimental/supervised_user_filtering_
switches.h" |
26 #include "chrome/browser/supervised_user/permission_request_creator.h" | 26 #include "chrome/browser/supervised_user/permission_request_creator.h" |
27 #include "chrome/browser/supervised_user/supervised_user_constants.h" | 27 #include "chrome/browser/supervised_user/supervised_user_constants.h" |
28 #include "chrome/browser/supervised_user/supervised_user_service_observer.h" | 28 #include "chrome/browser/supervised_user/supervised_user_service_observer.h" |
29 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" | 29 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" |
30 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" | 30 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor
y.h" |
31 #include "chrome/browser/supervised_user/supervised_user_site_list.h" | 31 #include "chrome/browser/supervised_user/supervised_user_site_list.h" |
32 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" | 32 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" |
33 #include "chrome/browser/sync/profile_sync_service.h" | |
34 #include "chrome/browser/sync/profile_sync_service_factory.h" | 33 #include "chrome/browser/sync/profile_sync_service_factory.h" |
35 #include "chrome/browser/ui/browser.h" | 34 #include "chrome/browser/ui/browser.h" |
36 #include "chrome/browser/ui/browser_list.h" | 35 #include "chrome/browser/ui/browser_list.h" |
37 #include "chrome/common/chrome_paths.h" | 36 #include "chrome/common/chrome_paths.h" |
38 #include "chrome/common/chrome_switches.h" | 37 #include "chrome/common/chrome_switches.h" |
39 #include "chrome/common/pref_names.h" | 38 #include "chrome/common/pref_names.h" |
40 #include "chrome/grit/generated_resources.h" | 39 #include "chrome/grit/generated_resources.h" |
| 40 #include "components/browser_sync/browser/profile_sync_service.h" |
41 #include "components/pref_registry/pref_registry_syncable.h" | 41 #include "components/pref_registry/pref_registry_syncable.h" |
42 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 42 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
43 #include "components/signin/core/browser/signin_manager.h" | 43 #include "components/signin/core/browser/signin_manager.h" |
44 #include "components/signin/core/browser/signin_manager_base.h" | 44 #include "components/signin/core/browser/signin_manager_base.h" |
45 #include "components/signin/core/common/signin_switches.h" | 45 #include "components/signin/core/common/signin_switches.h" |
46 #include "content/public/browser/browser_thread.h" | 46 #include "content/public/browser/browser_thread.h" |
47 #include "content/public/browser/user_metrics.h" | 47 #include "content/public/browser/user_metrics.h" |
48 #include "ui/base/l10n/l10n_util.h" | 48 #include "ui/base/l10n/l10n_util.h" |
49 | 49 |
50 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 50 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
(...skipping 944 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
995 | 995 |
996 is_profile_active_ = profile_became_active; | 996 is_profile_active_ = profile_became_active; |
997 } | 997 } |
998 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 998 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
999 | 999 |
1000 void SupervisedUserService::OnSiteListUpdated() { | 1000 void SupervisedUserService::OnSiteListUpdated() { |
1001 FOR_EACH_OBSERVER( | 1001 FOR_EACH_OBSERVER( |
1002 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged()); | 1002 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged()); |
1003 } | 1003 } |
1004 | 1004 |
OLD | NEW |