| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/focus/focus_manager.h" | 5 #include "ui/views/focus/focus_manager.h" |
| 6 | 6 |
| 7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
| 8 #include "ui/views/controls/button/text_button.h" | 8 #include "ui/views/controls/button/text_button.h" |
| 9 #include "ui/views/focus/accelerator_handler.h" | 9 #include "ui/views/focus/accelerator_handler.h" |
| 10 #include "ui/views/focus/focus_manager_test.h" | 10 #include "ui/views/focus/focus_manager_test.h" |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 MessageTrackingView* mtv = new MessageTrackingView(); | 214 MessageTrackingView* mtv = new MessageTrackingView(); |
| 215 mtv->AddAccelerator(ui::Accelerator(ui::VKEY_0, false, false, false)); | 215 mtv->AddAccelerator(ui::Accelerator(ui::VKEY_0, false, false, false)); |
| 216 mtv->AddAccelerator(ui::Accelerator(ui::VKEY_1, false, false, false)); | 216 mtv->AddAccelerator(ui::Accelerator(ui::VKEY_1, false, false, false)); |
| 217 GetContentsView()->AddChildView(mtv); | 217 GetContentsView()->AddChildView(mtv); |
| 218 focus_manager->SetFocusedView(mtv); | 218 focus_manager->SetFocusedView(mtv); |
| 219 | 219 |
| 220 // First send a non-accelerator key sequence. | 220 // First send a non-accelerator key sequence. |
| 221 PostKeyDown(ui::VKEY_9); | 221 PostKeyDown(ui::VKEY_9); |
| 222 PostKeyUp(ui::VKEY_9); | 222 PostKeyUp(ui::VKEY_9); |
| 223 AcceleratorHandler accelerator_handler; | 223 AcceleratorHandler accelerator_handler; |
| 224 MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); | 224 MessageLoopForUI::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
| 225 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); | 225 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); |
| 226 // Make sure we get a key-up and key-down. | 226 // Make sure we get a key-up and key-down. |
| 227 ASSERT_EQ(1U, mtv->keys_pressed().size()); | 227 ASSERT_EQ(1U, mtv->keys_pressed().size()); |
| 228 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]); | 228 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]); |
| 229 ASSERT_EQ(1U, mtv->keys_released().size()); | 229 ASSERT_EQ(1U, mtv->keys_released().size()); |
| 230 EXPECT_EQ(ui::VKEY_9, mtv->keys_released()[0]); | 230 EXPECT_EQ(ui::VKEY_9, mtv->keys_released()[0]); |
| 231 EXPECT_FALSE(mtv->accelerator_pressed()); | 231 EXPECT_FALSE(mtv->accelerator_pressed()); |
| 232 mtv->Reset(); | 232 mtv->Reset(); |
| 233 | 233 |
| 234 // Same thing with repeat and more than one key at once. | 234 // Same thing with repeat and more than one key at once. |
| 235 PostKeyDown(ui::VKEY_9); | 235 PostKeyDown(ui::VKEY_9); |
| 236 PostKeyDown(ui::VKEY_9); | 236 PostKeyDown(ui::VKEY_9); |
| 237 PostKeyDown(ui::VKEY_8); | 237 PostKeyDown(ui::VKEY_8); |
| 238 PostKeyDown(ui::VKEY_9); | 238 PostKeyDown(ui::VKEY_9); |
| 239 PostKeyDown(ui::VKEY_7); | 239 PostKeyDown(ui::VKEY_7); |
| 240 PostKeyUp(ui::VKEY_9); | 240 PostKeyUp(ui::VKEY_9); |
| 241 PostKeyUp(ui::VKEY_7); | 241 PostKeyUp(ui::VKEY_7); |
| 242 PostKeyUp(ui::VKEY_8); | 242 PostKeyUp(ui::VKEY_8); |
| 243 MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); | 243 MessageLoopForUI::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
| 244 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); | 244 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); |
| 245 // Make sure we get a key-up and key-down. | 245 // Make sure we get a key-up and key-down. |
| 246 ASSERT_EQ(5U, mtv->keys_pressed().size()); | 246 ASSERT_EQ(5U, mtv->keys_pressed().size()); |
| 247 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]); | 247 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[0]); |
| 248 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[1]); | 248 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[1]); |
| 249 EXPECT_EQ(ui::VKEY_8, mtv->keys_pressed()[2]); | 249 EXPECT_EQ(ui::VKEY_8, mtv->keys_pressed()[2]); |
| 250 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[3]); | 250 EXPECT_EQ(ui::VKEY_9, mtv->keys_pressed()[3]); |
| 251 EXPECT_EQ(ui::VKEY_7, mtv->keys_pressed()[4]); | 251 EXPECT_EQ(ui::VKEY_7, mtv->keys_pressed()[4]); |
| 252 ASSERT_EQ(3U, mtv->keys_released().size()); | 252 ASSERT_EQ(3U, mtv->keys_released().size()); |
| 253 EXPECT_EQ(ui::VKEY_9, mtv->keys_released()[0]); | 253 EXPECT_EQ(ui::VKEY_9, mtv->keys_released()[0]); |
| 254 EXPECT_EQ(ui::VKEY_7, mtv->keys_released()[1]); | 254 EXPECT_EQ(ui::VKEY_7, mtv->keys_released()[1]); |
| 255 EXPECT_EQ(ui::VKEY_8, mtv->keys_released()[2]); | 255 EXPECT_EQ(ui::VKEY_8, mtv->keys_released()[2]); |
| 256 EXPECT_FALSE(mtv->accelerator_pressed()); | 256 EXPECT_FALSE(mtv->accelerator_pressed()); |
| 257 mtv->Reset(); | 257 mtv->Reset(); |
| 258 | 258 |
| 259 // Now send an accelerator key sequence. | 259 // Now send an accelerator key sequence. |
| 260 PostKeyDown(ui::VKEY_0); | 260 PostKeyDown(ui::VKEY_0); |
| 261 PostKeyUp(ui::VKEY_0); | 261 PostKeyUp(ui::VKEY_0); |
| 262 MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); | 262 MessageLoopForUI::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
| 263 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); | 263 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); |
| 264 EXPECT_TRUE(mtv->keys_pressed().empty()); | 264 EXPECT_TRUE(mtv->keys_pressed().empty()); |
| 265 EXPECT_TRUE(mtv->keys_released().empty()); | 265 EXPECT_TRUE(mtv->keys_released().empty()); |
| 266 EXPECT_TRUE(mtv->accelerator_pressed()); | 266 EXPECT_TRUE(mtv->accelerator_pressed()); |
| 267 mtv->Reset(); | 267 mtv->Reset(); |
| 268 | 268 |
| 269 // Same thing with repeat and more than one key at once. | 269 // Same thing with repeat and more than one key at once. |
| 270 PostKeyDown(ui::VKEY_0); | 270 PostKeyDown(ui::VKEY_0); |
| 271 PostKeyDown(ui::VKEY_1); | 271 PostKeyDown(ui::VKEY_1); |
| 272 PostKeyDown(ui::VKEY_1); | 272 PostKeyDown(ui::VKEY_1); |
| 273 PostKeyDown(ui::VKEY_0); | 273 PostKeyDown(ui::VKEY_0); |
| 274 PostKeyDown(ui::VKEY_0); | 274 PostKeyDown(ui::VKEY_0); |
| 275 PostKeyUp(ui::VKEY_1); | 275 PostKeyUp(ui::VKEY_1); |
| 276 PostKeyUp(ui::VKEY_0); | 276 PostKeyUp(ui::VKEY_0); |
| 277 MessageLoopForUI::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask()); | 277 MessageLoopForUI::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
| 278 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); | 278 MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler); |
| 279 EXPECT_TRUE(mtv->keys_pressed().empty()); | 279 EXPECT_TRUE(mtv->keys_pressed().empty()); |
| 280 EXPECT_TRUE(mtv->keys_released().empty()); | 280 EXPECT_TRUE(mtv->keys_released().empty()); |
| 281 EXPECT_TRUE(mtv->accelerator_pressed()); | 281 EXPECT_TRUE(mtv->accelerator_pressed()); |
| 282 mtv->Reset(); | 282 mtv->Reset(); |
| 283 } | 283 } |
| 284 | 284 |
| 285 } // namespace views | 285 } // namespace views |
| OLD | NEW |