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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_service.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 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/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/files/file_util.h" 11 #include "base/files/file_util.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/prefs/pref_service.h"
15 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
17 #include "base/task_runner_util.h" 16 #include "base/task_runner_util.h"
18 #include "base/version.h" 17 #include "base/version.h"
19 #include "build/build_config.h" 18 #include "build/build_config.h"
20 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 20 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
22 #include "chrome/browser/net/file_downloader.h" 21 #include "chrome/browser/net/file_downloader.h"
23 #include "chrome/browser/profiles/profile.h" 22 #include "chrome/browser/profiles/profile.h"
24 #include "chrome/browser/profiles/profile_info_cache.h" 23 #include "chrome/browser/profiles/profile_info_cache.h"
(...skipping 10 matching lines...) Expand all
35 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h" 34 #include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
36 #include "chrome/browser/sync/profile_sync_service_factory.h" 35 #include "chrome/browser/sync/profile_sync_service_factory.h"
37 #include "chrome/browser/ui/browser.h" 36 #include "chrome/browser/ui/browser.h"
38 #include "chrome/browser/ui/browser_list.h" 37 #include "chrome/browser/ui/browser_list.h"
39 #include "chrome/common/chrome_paths.h" 38 #include "chrome/common/chrome_paths.h"
40 #include "chrome/common/chrome_switches.h" 39 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/pref_names.h" 40 #include "chrome/common/pref_names.h"
42 #include "chrome/grit/generated_resources.h" 41 #include "chrome/grit/generated_resources.h"
43 #include "components/browser_sync/browser/profile_sync_service.h" 42 #include "components/browser_sync/browser/profile_sync_service.h"
44 #include "components/pref_registry/pref_registry_syncable.h" 43 #include "components/pref_registry/pref_registry_syncable.h"
44 #include "components/prefs/pref_service.h"
45 #include "components/signin/core/browser/profile_oauth2_token_service.h" 45 #include "components/signin/core/browser/profile_oauth2_token_service.h"
46 #include "components/signin/core/browser/signin_manager.h" 46 #include "components/signin/core/browser/signin_manager.h"
47 #include "components/signin/core/browser/signin_manager_base.h" 47 #include "components/signin/core/browser/signin_manager_base.h"
48 #include "components/signin/core/common/signin_switches.h" 48 #include "components/signin/core/common/signin_switches.h"
49 #include "content/public/browser/browser_thread.h" 49 #include "content/public/browser/browser_thread.h"
50 #include "content/public/browser/user_metrics.h" 50 #include "content/public/browser/user_metrics.h"
51 #include "ui/base/l10n/l10n_util.h" 51 #include "ui/base/l10n/l10n_util.h"
52 52
53 #if !defined(OS_ANDROID) && !defined(OS_IOS) 53 #if !defined(OS_ANDROID) && !defined(OS_IOS)
54 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h" 54 #include "chrome/browser/supervised_user/legacy/custodian_profile_downloader_ser vice.h"
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 1045
1046 is_profile_active_ = profile_became_active; 1046 is_profile_active_ = profile_became_active;
1047 } 1047 }
1048 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) 1048 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
1049 1049
1050 void SupervisedUserService::OnSiteListUpdated() { 1050 void SupervisedUserService::OnSiteListUpdated() {
1051 FOR_EACH_OBSERVER( 1051 FOR_EACH_OBSERVER(
1052 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged()); 1052 SupervisedUserServiceObserver, observer_list_, OnURLFilterChanged());
1053 } 1053 }
1054 1054
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698