| 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/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 555 ScopedVector<SupervisedUserSiteList> | 555 ScopedVector<SupervisedUserSiteList> |
| 556 SupervisedUserService::GetActiveSiteLists() { | 556 SupervisedUserService::GetActiveSiteLists() { |
| 557 ScopedVector<SupervisedUserSiteList> site_lists; | 557 ScopedVector<SupervisedUserSiteList> site_lists; |
| 558 ExtensionService* extension_service = | 558 ExtensionService* extension_service = |
| 559 extensions::ExtensionSystem::Get(profile_)->extension_service(); | 559 extensions::ExtensionSystem::Get(profile_)->extension_service(); |
| 560 // Can be NULL in unit tests. | 560 // Can be NULL in unit tests. |
| 561 if (!extension_service) | 561 if (!extension_service) |
| 562 return site_lists.Pass(); | 562 return site_lists.Pass(); |
| 563 | 563 |
| 564 for (const scoped_refptr<const extensions::Extension>& extension : | 564 for (const scoped_refptr<const extensions::Extension>& extension : |
| 565 *extension_service->extensions()) { | 565 extensions::ExtensionRegistry::Get(profile_)->enabled_extensions()) { |
| 566 if (!extension_service->IsExtensionEnabled(extension->id())) | 566 if (!extension_service->IsExtensionEnabled(extension->id())) |
| 567 continue; | 567 continue; |
| 568 | 568 |
| 569 extensions::ExtensionResource site_list = | 569 extensions::ExtensionResource site_list = |
| 570 extensions::SupervisedUserInfo::GetContentPackSiteList(extension.get()); | 570 extensions::SupervisedUserInfo::GetContentPackSiteList(extension.get()); |
| 571 if (!site_list.empty()) { | 571 if (!site_list.empty()) { |
| 572 site_lists.push_back(new SupervisedUserSiteList(site_list.GetFilePath())); | 572 site_lists.push_back(new SupervisedUserSiteList(site_list.GetFilePath())); |
| 573 } | 573 } |
| 574 } | 574 } |
| 575 | 575 |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1007 // The active user can be NULL in unit tests. | 1007 // The active user can be NULL in unit tests. |
| 1008 if (user_manager::UserManager::Get()->GetActiveUser()) { | 1008 if (user_manager::UserManager::Get()->GetActiveUser()) { |
| 1009 return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName( | 1009 return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName( |
| 1010 user_manager::UserManager::Get()->GetActiveUser()->GetUserID())); | 1010 user_manager::UserManager::Get()->GetActiveUser()->GetUserID())); |
| 1011 } | 1011 } |
| 1012 return std::string(); | 1012 return std::string(); |
| 1013 #else | 1013 #else |
| 1014 return profile_->GetPrefs()->GetString(prefs::kProfileName); | 1014 return profile_->GetPrefs()->GetString(prefs::kProfileName); |
| 1015 #endif | 1015 #endif |
| 1016 } | 1016 } |
| OLD | NEW |