| 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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 return io_url_filter_.get(); | 435 return io_url_filter_.get(); |
| 436 } | 436 } |
| 437 | 437 |
| 438 void SupervisedUserService::URLFilterContext::SetDefaultFilteringBehavior( | 438 void SupervisedUserService::URLFilterContext::SetDefaultFilteringBehavior( |
| 439 SupervisedUserURLFilter::FilteringBehavior behavior) { | 439 SupervisedUserURLFilter::FilteringBehavior behavior) { |
| 440 ui_url_filter_->SetDefaultFilteringBehavior(behavior); | 440 ui_url_filter_->SetDefaultFilteringBehavior(behavior); |
| 441 BrowserThread::PostTask( | 441 BrowserThread::PostTask( |
| 442 BrowserThread::IO, | 442 BrowserThread::IO, |
| 443 FROM_HERE, | 443 FROM_HERE, |
| 444 base::Bind(&SupervisedUserURLFilter::SetDefaultFilteringBehavior, | 444 base::Bind(&SupervisedUserURLFilter::SetDefaultFilteringBehavior, |
| 445 io_url_filter_.get(), behavior)); | 445 io_url_filter_, behavior)); |
| 446 } | 446 } |
| 447 | 447 |
| 448 void SupervisedUserService::URLFilterContext::LoadWhitelists( | 448 void SupervisedUserService::URLFilterContext::LoadWhitelists( |
| 449 const std::vector<scoped_refptr<SupervisedUserSiteList> >& site_lists) { | 449 const std::vector<scoped_refptr<SupervisedUserSiteList> >& site_lists) { |
| 450 ui_url_filter_->LoadWhitelists(site_lists); | 450 ui_url_filter_->LoadWhitelists(site_lists); |
| 451 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, | 451 BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, |
| 452 base::Bind(&SupervisedUserURLFilter::LoadWhitelists, | 452 base::Bind(&SupervisedUserURLFilter::LoadWhitelists, |
| 453 io_url_filter_, site_lists)); | 453 io_url_filter_, site_lists)); |
| 454 } | 454 } |
| 455 | 455 |
| (...skipping 818 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 |