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

Side by Side Diff: chrome/browser/chromeos/events/event_rewriter_unittest.cc

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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
OLDNEW
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/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 1842 matching lines...) Expand 10 before | Expand all | Expand 10 after
1853 control.Init(prefs::kLanguageRemapControlKeyTo, &prefs); 1853 control.Init(prefs::kLanguageRemapControlKeyTo, &prefs);
1854 control.SetValue(chromeos::input_method::kAltKey); 1854 control.SetValue(chromeos::input_method::kAltKey);
1855 1855
1856 EventRewriter rewriter(NULL); 1856 EventRewriter rewriter(NULL);
1857 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard"); 1857 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard");
1858 rewriter.set_pref_service_for_testing(&prefs); 1858 rewriter.set_pref_service_for_testing(&prefs);
1859 1859
1860 const int kTouchId = 2; 1860 const int kTouchId = 2;
1861 gfx::Point location(0, 0); 1861 gfx::Point location(0, 0);
1862 ui::TouchEvent press(ui::ET_TOUCH_PRESSED, location, kTouchId, 1862 ui::TouchEvent press(ui::ET_TOUCH_PRESSED, location, kTouchId,
1863 base::TimeDelta()); 1863 base::TimeTicks());
1864 press.set_flags(ui::EF_CONTROL_DOWN); 1864 press.set_flags(ui::EF_CONTROL_DOWN);
1865 #if defined(USE_X11) 1865 #if defined(USE_X11)
1866 ui::UpdateX11EventForFlags(&press); 1866 ui::UpdateX11EventForFlags(&press);
1867 #endif 1867 #endif
1868 1868
1869 std::unique_ptr<ui::Event> new_event; 1869 std::unique_ptr<ui::Event> new_event;
1870 rewriter.RewriteEvent(press, &new_event); 1870 rewriter.RewriteEvent(press, &new_event);
1871 EXPECT_TRUE(new_event); 1871 EXPECT_TRUE(new_event);
1872 // Control should be remapped to Alt. 1872 // Control should be remapped to Alt.
1873 EXPECT_EQ(ui::EF_ALT_DOWN, 1873 EXPECT_EQ(ui::EF_ALT_DOWN,
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
2626 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); 2626 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
2627 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); 2627 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
2628 2628
2629 // Turn off AltGr and Mod3. 2629 // Turn off AltGr and Mod3.
2630 sticky_keys_controller_->SetModifiersEnabled(false, false); 2630 sticky_keys_controller_->SetModifiersEnabled(false, false);
2631 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); 2631 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
2632 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); 2632 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
2633 } 2633 }
2634 2634
2635 } // namespace chromeos 2635 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698