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/chromeos/login/users/avatar/user_image_manager_impl.h" | 5 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/debug/trace_event.h" | 8 #include "base/debug/trace_event.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 15 matching lines...) Expand all Loading... | |
26 #include "chrome/browser/chromeos/login/helper.h" | 26 #include "chrome/browser/chromeos/login/helper.h" |
27 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" | 27 #include "chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h" |
28 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 28 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
29 #include "chrome/browser/profiles/profile_downloader.h" | 29 #include "chrome/browser/profiles/profile_downloader.h" |
30 #include "chrome/browser/profiles/profile_manager.h" | 30 #include "chrome/browser/profiles/profile_manager.h" |
31 #include "chrome/common/chrome_paths.h" | 31 #include "chrome/common/chrome_paths.h" |
32 #include "chrome/grit/theme_resources.h" | 32 #include "chrome/grit/theme_resources.h" |
33 #include "components/user_manager/user_image/default_user_images.h" | 33 #include "components/user_manager/user_image/default_user_images.h" |
34 #include "components/user_manager/user_image/user_image.h" | 34 #include "components/user_manager/user_image/user_image.h" |
35 #include "components/user_manager/user_manager.h" | 35 #include "components/user_manager/user_manager.h" |
36 #include "components/user_manager/user_type.h" | 36 #include "components/user_manager/user_type.h" |
bartfab (slow)
2014/11/11 19:42:06
Nit: No longer used.
merkulova
2014/11/12 10:01:01
Done.
| |
37 #include "content/public/browser/browser_thread.h" | 37 #include "content/public/browser/browser_thread.h" |
38 #include "content/public/browser/notification_service.h" | 38 #include "content/public/browser/notification_service.h" |
39 #include "policy/policy_constants.h" | 39 #include "policy/policy_constants.h" |
40 #include "ui/base/resource/resource_bundle.h" | 40 #include "ui/base/resource/resource_bundle.h" |
41 #include "ui/gfx/image/image_skia.h" | 41 #include "ui/gfx/image/image_skia.h" |
42 | 42 |
43 namespace chromeos { | 43 namespace chromeos { |
44 | 44 |
45 namespace { | 45 namespace { |
46 | 46 |
(...skipping 969 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1016 } | 1016 } |
1017 | 1017 |
1018 user_manager::User* UserImageManagerImpl::GetUserAndModify() const { | 1018 user_manager::User* UserImageManagerImpl::GetUserAndModify() const { |
1019 return user_manager_->FindUserAndModify(user_id()); | 1019 return user_manager_->FindUserAndModify(user_id()); |
1020 } | 1020 } |
1021 | 1021 |
1022 bool UserImageManagerImpl::IsUserLoggedInAndRegular() const { | 1022 bool UserImageManagerImpl::IsUserLoggedInAndRegular() const { |
1023 const user_manager::User* user = GetUser(); | 1023 const user_manager::User* user = GetUser(); |
1024 if (!user) | 1024 if (!user) |
1025 return false; | 1025 return false; |
1026 return user->is_logged_in() && | 1026 return user->is_logged_in() && user->IsRegular(); |
1027 user->GetType() == user_manager::USER_TYPE_REGULAR; | |
1028 } | 1027 } |
1029 | 1028 |
1030 } // namespace chromeos | 1029 } // namespace chromeos |
OLD | NEW |