| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/shelf/shelf_background_animator.h" | 5 #include "ash/shelf/shelf_background_animator.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/animation/animation_change_type.h" | 9 #include "ash/animation/animation_change_type.h" |
| 10 #include "ash/shelf/shelf_background_animator_observer.h" | 10 #include "ash/shelf/shelf_background_animator_observer.h" |
| 11 #include "ash/shelf/shelf_constants.h" | 11 #include "ash/shelf/shelf_constants.h" |
| 12 #include "ash/wallpaper/wallpaper_controller.h" | 12 #include "ash/wallpaper/wallpaper_controller.h" |
| 13 #include "ash/wm_shell.h" | |
| 14 #include "base/bind.h" | 13 #include "base/bind.h" |
| 15 #include "base/macros.h" | 14 #include "base/macros.h" |
| 16 #include "base/test/test_mock_time_task_runner.h" | 15 #include "base/test/test_mock_time_task_runner.h" |
| 17 #include "base/threading/thread_task_runner_handle.h" | 16 #include "base/threading/thread_task_runner_handle.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 19 #include "ui/gfx/animation/slide_animation.h" | 18 #include "ui/gfx/animation/slide_animation.h" |
| 20 | 19 |
| 21 namespace ash { | 20 namespace ash { |
| 22 namespace { | 21 namespace { |
| 23 | 22 |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 ObserversAreNotifiedWhenSnappingToSameTargetBackground) { | 282 ObserversAreNotifiedWhenSnappingToSameTargetBackground) { |
| 284 PaintBackground(SHELF_BACKGROUND_DEFAULT); | 283 PaintBackground(SHELF_BACKGROUND_DEFAULT); |
| 285 SetColorValuesOnObserver(kDummyColor); | 284 SetColorValuesOnObserver(kDummyColor); |
| 286 PaintBackground(SHELF_BACKGROUND_DEFAULT); | 285 PaintBackground(SHELF_BACKGROUND_DEFAULT); |
| 287 | 286 |
| 288 EXPECT_NE(observer_.background_color(), kDummyColor); | 287 EXPECT_NE(observer_.background_color(), kDummyColor); |
| 289 EXPECT_NE(observer_.item_background_color(), kDummyColor); | 288 EXPECT_NE(observer_.item_background_color(), kDummyColor); |
| 290 } | 289 } |
| 291 | 290 |
| 292 } // namespace ash | 291 } // namespace ash |
| OLD | NEW |