| 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
|
|
|
|
|