OLD | NEW |
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/ntp_tiles/chrome_most_visited_sites_factory.h" | 5 #include "chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 } else { | 67 } else { |
68 DCHECK(supervisor_observer_); | 68 DCHECK(supervisor_observer_); |
69 } | 69 } |
70 | 70 |
71 supervisor_observer_ = new_observer; | 71 supervisor_observer_ = new_observer; |
72 } | 72 } |
73 | 73 |
74 bool SupervisorBridge::IsBlocked(const GURL& url) { | 74 bool SupervisorBridge::IsBlocked(const GURL& url) { |
75 SupervisedUserService* supervised_user_service = | 75 SupervisedUserService* supervised_user_service = |
76 SupervisedUserServiceFactory::GetForProfile(profile_); | 76 SupervisedUserServiceFactory::GetForProfile(profile_); |
77 auto* url_filter = supervised_user_service->GetURLFilterForUIThread(); | 77 auto* url_filter = supervised_user_service->GetURLFilter(); |
78 return url_filter->GetFilteringBehaviorForURL(url) == | 78 return url_filter->GetFilteringBehaviorForURL(url) == |
79 SupervisedUserURLFilter::FilteringBehavior::BLOCK; | 79 SupervisedUserURLFilter::FilteringBehavior::BLOCK; |
80 } | 80 } |
81 | 81 |
82 std::vector<ntp_tiles::MostVisitedSitesSupervisor::Whitelist> | 82 std::vector<ntp_tiles::MostVisitedSitesSupervisor::Whitelist> |
83 SupervisorBridge::whitelists() { | 83 SupervisorBridge::whitelists() { |
84 std::vector<MostVisitedSitesSupervisor::Whitelist> results; | 84 std::vector<MostVisitedSitesSupervisor::Whitelist> results; |
85 SupervisedUserService* supervised_user_service = | 85 SupervisedUserService* supervised_user_service = |
86 SupervisedUserServiceFactory::GetForProfile(profile_); | 86 SupervisedUserServiceFactory::GetForProfile(profile_); |
87 for (const auto& whitelist : supervised_user_service->whitelists()) { | 87 for (const auto& whitelist : supervised_user_service->whitelists()) { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 nullptr, | 122 nullptr, |
123 #endif | 123 #endif |
124 base::MakeUnique<ntp_tiles::IconCacherImpl>( | 124 base::MakeUnique<ntp_tiles::IconCacherImpl>( |
125 FaviconServiceFactory::GetForProfile( | 125 FaviconServiceFactory::GetForProfile( |
126 profile, ServiceAccessType::IMPLICIT_ACCESS), | 126 profile, ServiceAccessType::IMPLICIT_ACCESS), |
127 base::MakeUnique<image_fetcher::ImageFetcherImpl>( | 127 base::MakeUnique<image_fetcher::ImageFetcherImpl>( |
128 base::MakeUnique<suggestions::ImageDecoderImpl>(), | 128 base::MakeUnique<suggestions::ImageDecoderImpl>(), |
129 profile->GetRequestContext())), | 129 profile->GetRequestContext())), |
130 base::MakeUnique<SupervisorBridge>(profile)); | 130 base::MakeUnique<SupervisorBridge>(profile)); |
131 } | 131 } |
OLD | NEW |