| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 63 |
| 64 #if defined(ENABLE_THEMES) | 64 #if defined(ENABLE_THEMES) |
| 65 #include "chrome/browser/themes/theme_service.h" | 65 #include "chrome/browser/themes/theme_service.h" |
| 66 #include "chrome/browser/themes/theme_service_factory.h" | 66 #include "chrome/browser/themes/theme_service_factory.h" |
| 67 #endif | 67 #endif |
| 68 | 68 |
| 69 using base::DictionaryValue; | 69 using base::DictionaryValue; |
| 70 using base::UserMetricsAction; | 70 using base::UserMetricsAction; |
| 71 using content::BrowserThread; | 71 using content::BrowserThread; |
| 72 | 72 |
| 73 base::FilePath SupervisedUserService::Delegate::GetBlacklistPath() const { |
| 74 return base::FilePath(); |
| 75 } |
| 76 |
| 77 GURL SupervisedUserService::Delegate::GetBlacklistURL() const { |
| 78 return GURL(); |
| 79 } |
| 80 |
| 73 SupervisedUserService::URLFilterContext::URLFilterContext() | 81 SupervisedUserService::URLFilterContext::URLFilterContext() |
| 74 : ui_url_filter_(new SupervisedUserURLFilter), | 82 : ui_url_filter_(new SupervisedUserURLFilter), |
| 75 io_url_filter_(new SupervisedUserURLFilter) {} | 83 io_url_filter_(new SupervisedUserURLFilter) {} |
| 76 SupervisedUserService::URLFilterContext::~URLFilterContext() {} | 84 SupervisedUserService::URLFilterContext::~URLFilterContext() {} |
| 77 | 85 |
| 78 SupervisedUserURLFilter* | 86 SupervisedUserURLFilter* |
| 79 SupervisedUserService::URLFilterContext::ui_url_filter() const { | 87 SupervisedUserService::URLFilterContext::ui_url_filter() const { |
| 80 return ui_url_filter_.get(); | 88 return ui_url_filter_.get(); |
| 81 } | 89 } |
| 82 | 90 |
| (...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 943 // The active user can be NULL in unit tests. | 951 // The active user can be NULL in unit tests. |
| 944 if (user_manager::UserManager::Get()->GetActiveUser()) { | 952 if (user_manager::UserManager::Get()->GetActiveUser()) { |
| 945 return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName( | 953 return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName( |
| 946 user_manager::UserManager::Get()->GetActiveUser()->GetUserID())); | 954 user_manager::UserManager::Get()->GetActiveUser()->GetUserID())); |
| 947 } | 955 } |
| 948 return std::string(); | 956 return std::string(); |
| 949 #else | 957 #else |
| 950 return profile_->GetPrefs()->GetString(prefs::kProfileName); | 958 return profile_->GetPrefs()->GetString(prefs::kProfileName); |
| 951 #endif | 959 #endif |
| 952 } | 960 } |
| OLD | NEW |