Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: ash/shelf/shelf_background_animator_unittest.cc

Issue 2867413002: [ash-md] Updated the overflow shelf to change colors based on the wallpaper. (Closed)
Patch Set: Added ShelfViewTest.OverflowShelfColorIsDerivedFromWallpaper test. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
13 #include "base/bind.h" 12 #include "base/bind.h"
14 #include "base/macros.h" 13 #include "base/macros.h"
15 #include "base/test/test_mock_time_task_runner.h" 14 #include "base/test/test_mock_time_task_runner.h"
16 #include "base/threading/thread_task_runner_handle.h" 15 #include "base/threading/thread_task_runner_handle.h"
17 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
18 #include "ui/gfx/animation/slide_animation.h" 17 #include "ui/gfx/animation/slide_animation.h"
19 18
20 namespace ash { 19 namespace ash {
21 namespace { 20 namespace {
22 21
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 ObserversAreNotifiedWhenSnappingToSameTargetBackground) { 281 ObserversAreNotifiedWhenSnappingToSameTargetBackground) {
283 PaintBackground(SHELF_BACKGROUND_DEFAULT); 282 PaintBackground(SHELF_BACKGROUND_DEFAULT);
284 SetColorValuesOnObserver(kDummyColor); 283 SetColorValuesOnObserver(kDummyColor);
285 PaintBackground(SHELF_BACKGROUND_DEFAULT); 284 PaintBackground(SHELF_BACKGROUND_DEFAULT);
286 285
287 EXPECT_NE(observer_.background_color(), kDummyColor); 286 EXPECT_NE(observer_.background_color(), kDummyColor);
288 EXPECT_NE(observer_.item_background_color(), kDummyColor); 287 EXPECT_NE(observer_.item_background_color(), kDummyColor);
289 } 288 }
290 289
291 } // namespace ash 290 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698