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

Side by Side Diff: ui/views/animation/ink_drop_factory_unittest.cc

Issue 1968923003: Fix include path for moved thread_task_runner_handle.h header in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: Created 4 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 | « ui/ozone/public/ozone_gpu_test_helper.cc ('k') | ui/views/animation/ink_drop_impl_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/views/animation/ink_drop_factory.h" 5 #include "ui/views/animation/ink_drop_factory.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/test/test_mock_time_task_runner.h" 10 #include "base/test/test_mock_time_task_runner.h"
11 #include "base/thread_task_runner_handle.h" 11 #include "base/threading/thread_task_runner_handle.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include "ui/base/material_design/material_design_controller.h" 14 #include "ui/base/material_design/material_design_controller.h"
15 #include "ui/base/test/material_design_controller_test_api.h" 15 #include "ui/base/test/material_design_controller_test_api.h"
16 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 16 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
17 #include "ui/views/animation/ink_drop.h" 17 #include "ui/views/animation/ink_drop.h"
18 #include "ui/views/animation/ink_drop_host.h" 18 #include "ui/views/animation/ink_drop_host.h"
19 #include "ui/views/animation/ink_drop_impl.h" 19 #include "ui/views/animation/ink_drop_impl.h"
20 #include "ui/views/animation/ink_drop_state.h" 20 #include "ui/views/animation/ink_drop_state.h"
21 #include "ui/views/animation/test/test_ink_drop_host.h" 21 #include "ui/views/animation/test/test_ink_drop_host.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 149
150 TEST_P(InkDropFactoryTest, TypicalSlowActivated) { 150 TEST_P(InkDropFactoryTest, TypicalSlowActivated) {
151 ink_drop_->AnimateToState(InkDropState::ACTION_PENDING); 151 ink_drop_->AnimateToState(InkDropState::ACTION_PENDING);
152 ink_drop_->AnimateToState(InkDropState::ALTERNATE_ACTION_PENDING); 152 ink_drop_->AnimateToState(InkDropState::ALTERNATE_ACTION_PENDING);
153 ink_drop_->AnimateToState(InkDropState::ACTIVATED); 153 ink_drop_->AnimateToState(InkDropState::ACTIVATED);
154 ink_drop_->AnimateToState(InkDropState::DEACTIVATED); 154 ink_drop_->AnimateToState(InkDropState::DEACTIVATED);
155 EXPECT_EQ(InkDropState::HIDDEN, ink_drop_->GetTargetInkDropState()); 155 EXPECT_EQ(InkDropState::HIDDEN, ink_drop_->GetTargetInkDropState());
156 } 156 }
157 157
158 } // namespace views 158 } // namespace views
OLDNEW
« no previous file with comments | « ui/ozone/public/ozone_gpu_test_helper.cc ('k') | ui/views/animation/ink_drop_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698