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 <utility> | 5 #include <utility> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "ash/session/session_controller.h" | 8 #include "ash/session/session_controller.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
11 #include "ash/system/tray/system_tray.h" | 11 #include "ash/system/tray/system_tray.h" |
12 #include "ash/system/tray/tray_constants.h" | 12 #include "ash/system/tray/tray_constants.h" |
13 #include "ash/system/user/rounded_image_view.h" | 13 #include "ash/system/user/rounded_image_view.h" |
14 #include "ash/system/user/tray_user.h" | 14 #include "ash/system/user/tray_user.h" |
15 #include "ash/system/user/user_view.h" | 15 #include "ash/system/user/user_view.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ash/test/test_session_controller_client.h" | 17 #include "ash/test/test_session_controller_client.h" |
18 #include "ash/test/test_shell_delegate.h" | 18 #include "ash/test/test_shell_delegate.h" |
19 #include "ash/wm_shell.h" | |
20 #include "base/memory/ptr_util.h" | 19 #include "base/memory/ptr_util.h" |
21 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
22 #include "components/signin/core/account_id/account_id.h" | 21 #include "components/signin/core/account_id/account_id.h" |
23 #include "third_party/skia/include/core/SkBitmap.h" | 22 #include "third_party/skia/include/core/SkBitmap.h" |
24 #include "third_party/skia/include/core/SkColor.h" | 23 #include "third_party/skia/include/core/SkColor.h" |
25 #include "ui/accessibility/ax_node_data.h" | 24 #include "ui/accessibility/ax_node_data.h" |
26 #include "ui/events/test/event_generator.h" | 25 #include "ui/events/test/event_generator.h" |
27 #include "ui/gfx/animation/animation_container_element.h" | 26 #include "ui/gfx/animation/animation_container_element.h" |
28 #include "ui/gfx/image/image_skia.h" | 27 #include "ui/gfx/image/image_skia.h" |
29 #include "ui/gfx/image/image_unittest_util.h" | 28 #include "ui/gfx/image/image_unittest_util.h" |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 CreateImageSkiaWithColor(kTrayItemSize, kTrayItemSize, SK_ColorRED); | 292 CreateImageSkiaWithColor(kTrayItemSize, kTrayItemSize, SK_ColorRED); |
294 mojom::UserSessionPtr user = controller()->GetUserSession(0)->Clone(); | 293 mojom::UserSessionPtr user = controller()->GetUserSession(0)->Clone(); |
295 user->avatar = red_icon; | 294 user->avatar = red_icon; |
296 controller()->UpdateUserSession(std::move(user)); | 295 controller()->UpdateUserSession(std::move(user)); |
297 EXPECT_TRUE(gfx::test::AreImagesEqual( | 296 EXPECT_TRUE(gfx::test::AreImagesEqual( |
298 gfx::Image(red_icon), | 297 gfx::Image(red_icon), |
299 gfx::Image(tray_user(0)->avatar_view_for_test()->image_for_test()))); | 298 gfx::Image(tray_user(0)->avatar_view_for_test()->image_for_test()))); |
300 } | 299 } |
301 | 300 |
302 } // namespace ash | 301 } // namespace ash |
OLD | NEW |