OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/display/chromeos/display_configurator.h" | 5 #include "ui/display/chromeos/display_configurator.h" |
6 | 6 |
7 #include "base/memory/scoped_vector.h" | 7 #include "base/memory/scoped_vector.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
10 #include "ui/display/chromeos/test/action_logger_util.h" | 10 #include "ui/display/chromeos/test/action_logger_util.h" |
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1168 TEST_F(DisplayConfiguratorTest, ExternalControl) { | 1168 TEST_F(DisplayConfiguratorTest, ExternalControl) { |
1169 InitWithSingleOutput(); | 1169 InitWithSingleOutput(); |
1170 state_controller_.set_state(MULTIPLE_DISPLAY_STATE_SINGLE); | 1170 state_controller_.set_state(MULTIPLE_DISPLAY_STATE_SINGLE); |
1171 configurator_.RelinquishControl(); | 1171 configurator_.RelinquishControl(); |
1172 EXPECT_EQ( | 1172 EXPECT_EQ( |
1173 JoinActions( | 1173 JoinActions( |
1174 kRelinquishDisplayControl, | 1174 kRelinquishDisplayControl, |
1175 NULL), | 1175 NULL), |
1176 log_->GetActionsAndClear()); | 1176 log_->GetActionsAndClear()); |
1177 configurator_.TakeControl(); | 1177 configurator_.TakeControl(); |
1178 EXPECT_EQ( | 1178 EXPECT_EQ(JoinActions(kTakeDisplayControl, kGrab, |
1179 JoinActions( | 1179 GetFramebufferAction(small_mode_.size(), &outputs_[0], |
1180 kTakeDisplayControl, | 1180 nullptr).c_str(), |
1181 GetCrtcAction(outputs_[0], &small_mode_, gfx::Point(0, 0)).c_str(), | 1181 GetCrtcAction(outputs_[0], &small_mode_, |
1182 NULL), | 1182 gfx::Point(0, 0)).c_str(), |
1183 log_->GetActionsAndClear()); | 1183 kUngrab, NULL), |
| 1184 log_->GetActionsAndClear()); |
1184 } | 1185 } |
1185 | 1186 |
1186 } // namespace test | 1187 } // namespace test |
1187 } // namespace ui | 1188 } // namespace ui |
OLD | NEW |