| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 // Disabled right now as this won't work on BuildBots right now as this test | 5 // Disabled right now as this won't work on BuildBots right now as this test |
| 6 // require the box it runs on to be unlocked (and no screen-savers). | 6 // require the box it runs on to be unlocked (and no screen-savers). |
| 7 // The test actually simulates mouse and key events, so if the screen is locked, | 7 // The test actually simulates mouse and key events, so if the screen is locked, |
| 8 // the events don't go to the Chrome window. | 8 // the events don't go to the Chrome window. |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| (...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 public: | 864 public: |
| 865 NoNativeFocusView() { | 865 NoNativeFocusView() { |
| 866 SetFocusable(true); | 866 SetFocusable(true); |
| 867 } | 867 } |
| 868 virtual void Focus() { | 868 virtual void Focus() { |
| 869 } | 869 } |
| 870 }; | 870 }; |
| 871 | 871 |
| 872 // Tests that the NativeViewHost class sets the focus View appropriately on the | 872 // Tests that the NativeViewHost class sets the focus View appropriately on the |
| 873 // FocusManager. | 873 // FocusManager. |
| 874 #if defined(OS_WIN) |
| 874 TEST_F(FocusManagerTest, FocusNativeViewHost) { | 875 TEST_F(FocusManagerTest, FocusNativeViewHost) { |
| 876 #else |
| 877 // TODO(jcampan): http::/crbug.com/23394 Disabled as it fails following the |
| 878 // NativeViewHost refactoring. |
| 879 TEST_F(FocusManagerTest, DISABLED_FocusNativeViewHost) { |
| 880 #endif |
| 875 { | 881 { |
| 876 // Test wrapping a simple native view. | 882 // Test wrapping a simple native view. |
| 877 gfx::NativeView native_view = | 883 gfx::NativeView native_view = |
| 878 CreateChildNativeView(content_view_->GetWidget()->GetNativeView()); | 884 CreateChildNativeView(content_view_->GetWidget()->GetNativeView()); |
| 879 NativeViewHost* native_view_host = new NativeViewHost(); | 885 NativeViewHost* native_view_host = new NativeViewHost(); |
| 880 content_view_->AddChildView(native_view_host); | 886 content_view_->AddChildView(native_view_host); |
| 881 native_view_host->Attach(native_view); | 887 native_view_host->Attach(native_view); |
| 882 FocusNativeView(native_view); | 888 FocusNativeView(native_view); |
| 883 EXPECT_EQ(native_view_host, GetFocusManager()->GetFocusedView()); | 889 EXPECT_EQ(native_view_host, GetFocusManager()->GetFocusedView()); |
| 884 GetFocusManager()->ClearFocus(); | 890 GetFocusManager()->ClearFocus(); |
| (...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1259 EXPECT_EQ(target.accelerator_count(), 1); | 1265 EXPECT_EQ(target.accelerator_count(), 1); |
| 1260 EXPECT_EQ(NULL, | 1266 EXPECT_EQ(NULL, |
| 1261 focus_manager->GetCurrentTargetForAccelerator(return_accelerator)); | 1267 focus_manager->GetCurrentTargetForAccelerator(return_accelerator)); |
| 1262 | 1268 |
| 1263 // Hitting the return key again; nothing should happen. | 1269 // Hitting the return key again; nothing should happen. |
| 1264 EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator)); | 1270 EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator)); |
| 1265 EXPECT_EQ(target.accelerator_count(), 1); | 1271 EXPECT_EQ(target.accelerator_count(), 1); |
| 1266 } | 1272 } |
| 1267 | 1273 |
| 1268 } // namespace views | 1274 } // namespace views |
| OLD | NEW |