| 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/profiles/avatar_menu.h" | 5 #include "chrome/browser/profiles/avatar_menu.h" |
| 6 | 6 |
| 7 #include <stddef.h> |
| 8 |
| 7 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/profiles/profile_avatar_icon_util.h" | 11 #include "chrome/browser/profiles/profile_avatar_icon_util.h" |
| 10 #include "chrome/browser/profiles/profile_info_cache.h" | 12 #include "chrome/browser/profiles/profile_info_cache.h" |
| 11 #include "chrome/browser/profiles/profile_manager.h" | 13 #include "chrome/browser/profiles/profile_manager.h" |
| 12 #include "ui/base/resource/resource_bundle.h" | 14 #include "ui/base/resource/resource_bundle.h" |
| 13 | 15 |
| 14 // static | 16 // static |
| 15 void AvatarMenu::GetImageForMenuButton(const base::FilePath& profile_path, | 17 void AvatarMenu::GetImageForMenuButton(const base::FilePath& profile_path, |
| 16 gfx::Image* image, | 18 gfx::Image* image, |
| (...skipping 16 matching lines...) Expand all Loading... |
| 33 } | 35 } |
| 34 } | 36 } |
| 35 | 37 |
| 36 // Otherwise, use the default resource, not the downloaded high-res one. | 38 // Otherwise, use the default resource, not the downloaded high-res one. |
| 37 const size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(index); | 39 const size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(index); |
| 38 const int resource_id = | 40 const int resource_id = |
| 39 profiles::GetDefaultAvatarIconResourceIDAtIndex(icon_index); | 41 profiles::GetDefaultAvatarIconResourceIDAtIndex(icon_index); |
| 40 *image = ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); | 42 *image = ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); |
| 41 *is_rectangle = false; | 43 *is_rectangle = false; |
| 42 } | 44 } |
| OLD | NEW |