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

Unified Diff: chrome/browser/automation/ui_controls_gtk.cc

Issue 8585015: Implement ui_controls for aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no mask for xsendevent Created 9 years, 1 month 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
« no previous file with comments | « chrome/browser/automation/ui_controls_aurax11.cc ('k') | chrome/browser/automation/ui_controls_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/ui_controls_gtk.cc
diff --git a/chrome/browser/automation/ui_controls_gtk.cc b/chrome/browser/automation/ui_controls_gtk.cc
index 0ca2378080398ea48f757899b5d361109a00ef3e..8c7d99a1bc16899c7d0bd61b328ed716ee38e355 100644
--- a/chrome/browser/automation/ui_controls_gtk.cc
+++ b/chrome/browser/automation/ui_controls_gtk.cc
@@ -53,7 +53,7 @@ class EventWaiter : public MessageLoopForUI::Observer {
}
#else
// MessageLoop::Observer implementation:
- virtual void WillProcessEvent(GdkEvent* event) {
+ virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {
if ((event->type == type_) && (--count_ == 0)) {
// At the time we're invoked the event has not actually been processed.
// Use PostTask to make sure the event has been processed before
@@ -66,7 +66,7 @@ class EventWaiter : public MessageLoopForUI::Observer {
}
}
- virtual void DidProcessEvent(GdkEvent* event) {
+ virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {
// No-op.
}
#endif
@@ -240,7 +240,8 @@ bool SendMouseEvents(MouseButton type, int state) {
return false;
}
-bool SendMouseEventsNotifyWhenDone(MouseButton type, int state,
+bool SendMouseEventsNotifyWhenDone(MouseButton type,
+ int state,
const base::Closure& task) {
bool rv = SendMouseEvents(type, state);
GdkEventType wait_type;
@@ -290,8 +291,10 @@ void SynchronizeWidgetSize(views::Widget* widget) {
}
#endif
-void MoveMouseToCenterAndPress(views::View* view, MouseButton button,
- int state, const base::Closure& task) {
+void MoveMouseToCenterAndPress(views::View* view,
+ MouseButton button,
+ int state,
+ const base::Closure& task) {
#if defined(OS_LINUX)
// X is asynchronous and we need to wait until the window gets
// resized to desired size.
@@ -302,7 +305,7 @@ void MoveMouseToCenterAndPress(views::View* view, MouseButton button,
views::View::ConvertPointToScreen(view, &view_center);
SendMouseMoveNotifyWhenDone(
view_center.x(), view_center.y(),
- base::Bind(&ui_controls::ClickTask, button, state, task));
+ base::Bind(&ui_controls::internal::ClickTask, button, state, task));
}
#else
void MoveMouseToCenterAndPress(GtkWidget* widget,
@@ -313,7 +316,7 @@ void MoveMouseToCenterAndPress(GtkWidget* widget,
SendMouseMoveNotifyWhenDone(
bounds.x() + bounds.width() / 2,
bounds.y() + bounds.height() / 2,
- base::Bind(&ui_controls::ClickTask, button, state, task));
+ base::Bind(&ui_controls::internal::ClickTask, button, state, task));
}
#endif
« no previous file with comments | « chrome/browser/automation/ui_controls_aurax11.cc ('k') | chrome/browser/automation/ui_controls_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698