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 "chrome/browser/chromeos/events/event_rewriter.h" | 5 #include "chrome/browser/chromeos/events/event_rewriter.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/sticky_keys/sticky_keys_controller.h" | 10 #include "ash/sticky_keys/sticky_keys_controller.h" |
11 #include "ash/sticky_keys/sticky_keys_overlay.h" | 11 #include "ash/sticky_keys/sticky_keys_overlay.h" |
12 #include "ash/test/ash_test_base.h" | 12 #include "ash/test/ash_test_base.h" |
13 #include "ash/wm/window_state.h" | 13 #include "ash/wm/window_state.h" |
14 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
15 #include "base/command_line.h" | 15 #include "base/command_line.h" |
16 #include "base/prefs/pref_member.h" | 16 #include "base/prefs/pref_member.h" |
17 #include "base/strings/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
18 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 18 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
19 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" | 19 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" |
20 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" | |
21 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 20 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
22 #include "chrome/browser/chromeos/preferences.h" | 21 #include "chrome/browser/chromeos/preferences.h" |
23 #include "chrome/common/pref_names.h" | 22 #include "chrome/common/pref_names.h" |
24 #include "chrome/test/base/testing_pref_service_syncable.h" | 23 #include "chrome/test/base/testing_pref_service_syncable.h" |
25 #include "chromeos/chromeos_switches.h" | 24 #include "chromeos/chromeos_switches.h" |
| 25 #include "components/user_manager/fake_user_manager.h" |
26 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" |
27 #include "ui/aura/window.h" | 27 #include "ui/aura/window.h" |
28 #include "ui/aura/window_tree_host.h" | 28 #include "ui/aura/window_tree_host.h" |
29 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" | 29 #include "ui/base/ime/chromeos/fake_ime_keyboard.h" |
30 #include "ui/events/event.h" | 30 #include "ui/events/event.h" |
31 #include "ui/events/event_rewriter.h" | 31 #include "ui/events/event_rewriter.h" |
32 #include "ui/events/test/events_test_utils.h" | 32 #include "ui/events/test/events_test_utils.h" |
33 #include "ui/events/test/test_event_processor.h" | 33 #include "ui/events/test/test_event_processor.h" |
34 | 34 |
35 #if defined(USE_X11) | 35 #if defined(USE_X11) |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 #endif | 215 #endif |
216 } | 216 } |
217 | 217 |
218 } // namespace | 218 } // namespace |
219 | 219 |
220 namespace chromeos { | 220 namespace chromeos { |
221 | 221 |
222 class EventRewriterTest : public ash::test::AshTestBase { | 222 class EventRewriterTest : public ash::test::AshTestBase { |
223 public: | 223 public: |
224 EventRewriterTest() | 224 EventRewriterTest() |
225 : fake_user_manager_(new chromeos::FakeUserManager), | 225 : fake_user_manager_(new user_manager::FakeUserManager), |
226 user_manager_enabler_(fake_user_manager_), | 226 user_manager_enabler_(fake_user_manager_), |
227 input_method_manager_mock_(NULL) {} | 227 input_method_manager_mock_(NULL) {} |
228 ~EventRewriterTest() override {} | 228 ~EventRewriterTest() override {} |
229 | 229 |
230 void SetUp() override { | 230 void SetUp() override { |
231 input_method_manager_mock_ = | 231 input_method_manager_mock_ = |
232 new chromeos::input_method::MockInputMethodManager; | 232 new chromeos::input_method::MockInputMethodManager; |
233 chromeos::input_method::InitializeForTesting( | 233 chromeos::input_method::InitializeForTesting( |
234 input_method_manager_mock_); // pass ownership | 234 input_method_manager_mock_); // pass ownership |
235 | 235 |
(...skipping 12 matching lines...) Expand all Loading... |
248 | 248 |
249 const ui::MouseEvent* RewriteMouseButtonEvent( | 249 const ui::MouseEvent* RewriteMouseButtonEvent( |
250 chromeos::EventRewriter* rewriter, | 250 chromeos::EventRewriter* rewriter, |
251 const ui::MouseEvent& event, | 251 const ui::MouseEvent& event, |
252 scoped_ptr<ui::Event>* new_event) { | 252 scoped_ptr<ui::Event>* new_event) { |
253 rewriter->RewriteMouseButtonEventForTesting(event, new_event); | 253 rewriter->RewriteMouseButtonEventForTesting(event, new_event); |
254 return *new_event ? static_cast<const ui::MouseEvent*>(new_event->get()) | 254 return *new_event ? static_cast<const ui::MouseEvent*>(new_event->get()) |
255 : &event; | 255 : &event; |
256 } | 256 } |
257 | 257 |
258 chromeos::FakeUserManager* fake_user_manager_; // Not owned. | 258 user_manager::FakeUserManager* fake_user_manager_; // Not owned. |
259 chromeos::ScopedUserManagerEnabler user_manager_enabler_; | 259 chromeos::ScopedUserManagerEnabler user_manager_enabler_; |
260 chromeos::input_method::MockInputMethodManager* input_method_manager_mock_; | 260 chromeos::input_method::MockInputMethodManager* input_method_manager_mock_; |
261 }; | 261 }; |
262 | 262 |
263 TEST_F(EventRewriterTest, TestRewriteCommandToControl) { | 263 TEST_F(EventRewriterTest, TestRewriteCommandToControl) { |
264 // First, test with a PC keyboard. | 264 // First, test with a PC keyboard. |
265 TestingPrefServiceSyncable prefs; | 265 TestingPrefServiceSyncable prefs; |
266 EventRewriter rewriter(NULL); | 266 EventRewriter rewriter(NULL); |
267 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard"); | 267 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard"); |
268 rewriter.set_last_keyboard_device_id_for_testing(kKeyboardDeviceId); | 268 rewriter.set_last_keyboard_device_id_for_testing(kKeyboardDeviceId); |
(...skipping 1545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1814 | 1814 |
1815 private: | 1815 private: |
1816 ui::EventProcessor* processor_; | 1816 ui::EventProcessor* processor_; |
1817 }; | 1817 }; |
1818 | 1818 |
1819 // Tests of event rewriting that depend on the Ash window manager. | 1819 // Tests of event rewriting that depend on the Ash window manager. |
1820 class EventRewriterAshTest : public ash::test::AshTestBase { | 1820 class EventRewriterAshTest : public ash::test::AshTestBase { |
1821 public: | 1821 public: |
1822 EventRewriterAshTest() | 1822 EventRewriterAshTest() |
1823 : source_(&buffer_), | 1823 : source_(&buffer_), |
1824 fake_user_manager_(new chromeos::FakeUserManager), | 1824 fake_user_manager_(new user_manager::FakeUserManager), |
1825 user_manager_enabler_(fake_user_manager_) {} | 1825 user_manager_enabler_(fake_user_manager_) {} |
1826 ~EventRewriterAshTest() override {} | 1826 ~EventRewriterAshTest() override {} |
1827 | 1827 |
1828 bool RewriteFunctionKeys(const ui::Event& event, | 1828 bool RewriteFunctionKeys(const ui::Event& event, |
1829 scoped_ptr<ui::Event>* rewritten_event) { | 1829 scoped_ptr<ui::Event>* rewritten_event) { |
1830 return rewriter_->RewriteEvent(event, rewritten_event); | 1830 return rewriter_->RewriteEvent(event, rewritten_event); |
1831 } | 1831 } |
1832 | 1832 |
1833 ui::EventDispatchDetails Send(ui::Event* event) { | 1833 ui::EventDispatchDetails Send(ui::Event* event) { |
1834 return source_.Send(event); | 1834 return source_.Send(event); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1873 | 1873 |
1874 protected: | 1874 protected: |
1875 ash::StickyKeysController* sticky_keys_controller_; | 1875 ash::StickyKeysController* sticky_keys_controller_; |
1876 | 1876 |
1877 private: | 1877 private: |
1878 scoped_ptr<EventRewriter> rewriter_; | 1878 scoped_ptr<EventRewriter> rewriter_; |
1879 | 1879 |
1880 EventBuffer buffer_; | 1880 EventBuffer buffer_; |
1881 TestEventSource source_; | 1881 TestEventSource source_; |
1882 | 1882 |
1883 chromeos::FakeUserManager* fake_user_manager_; // Not owned. | 1883 user_manager::FakeUserManager* fake_user_manager_; // Not owned. |
1884 chromeos::ScopedUserManagerEnabler user_manager_enabler_; | 1884 chromeos::ScopedUserManagerEnabler user_manager_enabler_; |
1885 TestingPrefServiceSyncable prefs_; | 1885 TestingPrefServiceSyncable prefs_; |
1886 | 1886 |
1887 DISALLOW_COPY_AND_ASSIGN(EventRewriterAshTest); | 1887 DISALLOW_COPY_AND_ASSIGN(EventRewriterAshTest); |
1888 }; | 1888 }; |
1889 | 1889 |
1890 TEST_F(EventRewriterAshTest, TopRowKeysAreFunctionKeys) { | 1890 TEST_F(EventRewriterAshTest, TopRowKeysAreFunctionKeys) { |
1891 scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(1)); | 1891 scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(1)); |
1892 ash::wm::WindowState* window_state = ash::wm::GetWindowState(window.get()); | 1892 ash::wm::WindowState* window_state = ash::wm::GetWindowState(window.get()); |
1893 window_state->Activate(); | 1893 window_state->Activate(); |
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2484 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); | 2484 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); |
2485 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); | 2485 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); |
2486 | 2486 |
2487 // Turn off AltGr and Mod3. | 2487 // Turn off AltGr and Mod3. |
2488 sticky_keys_controller_->SetModifiersEnabled(false, false); | 2488 sticky_keys_controller_->SetModifiersEnabled(false, false); |
2489 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); | 2489 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); |
2490 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); | 2490 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); |
2491 } | 2491 } |
2492 | 2492 |
2493 } // namespace chromeos | 2493 } // namespace chromeos |
OLD | NEW |