OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ash/system/user/tray_user.h" | 5 #include "ash/system/user/tray_user.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <climits> | 8 #include <climits> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
12 #include "ash/shell_delegate.h" | 12 #include "ash/shell_delegate.h" |
13 #include "ash/system/tray/system_tray.h" | 13 #include "ash/system/tray/system_tray.h" |
14 #include "ash/system/tray/system_tray_delegate.h" | 14 #include "ash/system/tray/system_tray_delegate.h" |
15 #include "ash/system/tray/system_tray_notifier.h" | 15 #include "ash/system/tray/system_tray_notifier.h" |
16 #include "ash/system/tray/tray_constants.h" | 16 #include "ash/system/tray/tray_constants.h" |
17 #include "ash/system/tray/tray_item_view.h" | 17 #include "ash/system/tray/tray_item_view.h" |
18 #include "ash/system/tray/tray_popup_label_button.h" | 18 #include "ash/system/tray/tray_popup_label_button.h" |
19 #include "ash/system/tray/tray_popup_label_button_border.h" | 19 #include "ash/system/tray/tray_popup_label_button_border.h" |
| 20 #include "ash/system/tray/tray_utils.h" |
20 #include "base/i18n/rtl.h" | 21 #include "base/i18n/rtl.h" |
21 #include "base/logging.h" | 22 #include "base/logging.h" |
22 #include "base/memory/scoped_vector.h" | 23 #include "base/memory/scoped_vector.h" |
23 #include "base/string16.h" | 24 #include "base/string16.h" |
24 #include "base/string_util.h" | 25 #include "base/string_util.h" |
25 #include "base/utf_string_conversions.h" | 26 #include "base/utf_string_conversions.h" |
26 #include "grit/ash_resources.h" | 27 #include "grit/ash_resources.h" |
27 #include "grit/ash_strings.h" | 28 #include "grit/ash_strings.h" |
28 #include "skia/ext/image_operations.h" | 29 #include "skia/ext/image_operations.h" |
29 #include "third_party/skia/include/core/SkCanvas.h" | 30 #include "third_party/skia/include/core/SkCanvas.h" |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
678 // Check for null to avoid crbug.com/150944. | 679 // Check for null to avoid crbug.com/150944. |
679 if (avatar_) { | 680 if (avatar_) { |
680 avatar_->SetImage( | 681 avatar_->SetImage( |
681 ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(), | 682 ash::Shell::GetInstance()->system_tray_delegate()->GetUserImage(), |
682 gfx::Size(kUserIconSize, kUserIconSize)); | 683 gfx::Size(kUserIconSize, kUserIconSize)); |
683 } | 684 } |
684 } | 685 } |
685 | 686 |
686 } // namespace internal | 687 } // namespace internal |
687 } // namespace ash | 688 } // namespace ash |
OLD | NEW |