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

Unified Diff: content/shell/test_runner/event_sender.h

Issue 2707183003: Move //components/test_runner back into //content/shell (Closed)
Patch Set: Trim DEPS Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/shell/test_runner/event_sender.h
diff --git a/components/test_runner/event_sender.h b/content/shell/test_runner/event_sender.h
similarity index 90%
rename from components/test_runner/event_sender.h
rename to content/shell/test_runner/event_sender.h
index 344ad8e8cac0f58205c177e43966d70383e362b1..9c717c12f655a06b7724509f5c413277412445dc 100644
--- a/components/test_runner/event_sender.h
+++ b/content/shell/test_runner/event_sender.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
-#define COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
+#ifndef CONTENT_SHELL_TEST_RUNNER_EVENT_SENDER_H_
+#define CONTENT_SHELL_TEST_RUNNER_EVENT_SENDER_H_
#include <stdint.h>
@@ -45,10 +45,10 @@ class WebTestDelegate;
// Key event location code introduced in DOM Level 3.
// See also: http://www.w3.org/TR/DOM-Level-3-Events/#events-keyboardevents
enum KeyLocationCode {
- DOMKeyLocationStandard = 0x00,
- DOMKeyLocationLeft = 0x01,
- DOMKeyLocationRight = 0x02,
- DOMKeyLocationNumpad = 0x03
+ DOMKeyLocationStandard = 0x00,
+ DOMKeyLocationLeft = 0x01,
+ DOMKeyLocationRight = 0x02,
+ DOMKeyLocationNumpad = 0x03
};
class EventSender {
@@ -180,8 +180,7 @@ class EventSender {
uint32_t GetUniqueTouchEventId(gin::Arguments* args);
void SendCurrentTouchEvent(blink::WebInputEvent::Type, gin::Arguments* args);
- void GestureEvent(blink::WebInputEvent::Type,
- gin::Arguments*);
+ void GestureEvent(blink::WebInputEvent::Type, gin::Arguments*);
void UpdateClickCountForButton(blink::WebMouseEvent::Button);
@@ -230,9 +229,7 @@ class EventSender {
void set_wm_char(int wm_char) { wm_char_ = wm_char; }
int wm_dead_char() const { return wm_dead_char_; }
- void set_wm_dead_char(int dead_char) {
- wm_dead_char_ = dead_char;
- }
+ void set_wm_dead_char(int dead_char) { wm_dead_char_ = dead_char; }
int wm_sys_key_down() const { return wm_sys_key_down_; }
void set_wm_sys_key_down(int key_down) { wm_sys_key_down_ = key_down; }
@@ -285,23 +282,23 @@ class EventSender {
// Mouse-like pointer properties.
struct PointerState {
- // Last pressed button (Left/Right/Middle or None).
- blink::WebMouseEvent::Button pressed_button_;
+ // Last pressed button (Left/Right/Middle or None).
+ blink::WebMouseEvent::Button pressed_button_;
- // A bitwise OR of the WebMouseEvent::*ButtonDown values corresponding to
- // currently pressed buttons of the pointer (e.g. pen or mouse).
- int current_buttons_;
+ // A bitwise OR of the WebMouseEvent::*ButtonDown values corresponding to
+ // currently pressed buttons of the pointer (e.g. pen or mouse).
+ int current_buttons_;
- // Location of last mouseMoveTo event of this pointer.
- blink::WebPoint last_pos_;
+ // Location of last mouseMoveTo event of this pointer.
+ blink::WebPoint last_pos_;
- int modifiers_;
+ int modifiers_;
- PointerState()
- : pressed_button_(blink::WebMouseEvent::Button::NoButton)
- , current_buttons_(0)
- , last_pos_(blink::WebPoint(0, 0))
- , modifiers_(0) { }
+ PointerState()
+ : pressed_button_(blink::WebMouseEvent::Button::NoButton),
+ current_buttons_(0),
+ last_pos_(blink::WebPoint(0, 0)),
+ modifiers_(0) {}
};
typedef std::unordered_map<int, PointerState> PointerStateMap;
PointerStateMap current_pointer_state_;
@@ -334,4 +331,4 @@ class EventSender {
} // namespace test_runner
-#endif // COMPONENTS_TEST_RUNNER_EVENT_SENDER_H_
+#endif // CONTENT_SHELL_TEST_RUNNER_EVENT_SENDER_H_

Powered by Google App Engine
This is Rietveld 408576698