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

Unified Diff: views/widget/root_view.cc

Issue 6480001: Migrate Event API methods to Google Style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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: views/widget/root_view.cc
===================================================================
--- views/widget/root_view.cc (revision 74326)
+++ views/widget/root_view.cc (working copy)
@@ -386,8 +386,8 @@
// are formed from a single-click followed by a double-click event. When the
// double-click event lands on a different view than its single-click part,
// we transform it into a single-click which prevents odd things.
- if ((e.GetFlags() & MouseEvent::EF_IS_NON_CLIENT) &&
- !(e.GetFlags() & MouseEvent::EF_IS_DOUBLE_CLICK)) {
+ if ((e.flags() & MouseEvent::EF_IS_NON_CLIENT) &&
+ !(e.flags() & MouseEvent::EF_IS_DOUBLE_CLICK)) {
last_click_handler_ = NULL;
return false;
}
@@ -424,7 +424,7 @@
// Remove the double-click flag if the handler is different than the
// one which got the first click part of the double-click.
if (mouse_pressed_handler_ != last_click_handler_)
- mouse_pressed_event.set_flags(e.GetFlags() &
+ mouse_pressed_event.set_flags(e.flags() &
~MouseEvent::EF_IS_DOUBLE_CLICK);
drag_info.Reset();
@@ -469,7 +469,7 @@
// entire hierarchy (even as a single-click when sent to a different view),
// it must be marked as handled to avoid anything happening from default
// processing if it the first click-part was handled by us.
- if (last_click_handler_ && e.GetFlags() & MouseEvent::EF_IS_DOUBLE_CLICK)
+ if (last_click_handler_ && e.flags() & MouseEvent::EF_IS_DOUBLE_CLICK)
hit_disabled_view = true;
last_click_handler_ = NULL;
@@ -508,7 +508,7 @@
if (v && v != this) {
gfx::Point l(e.location());
View::ConvertPointToView(this, v, &l);
- cursor = v->GetCursorForPoint(e.GetType(), l);
+ cursor = v->GetCursorForPoint(e.type(), l);
}
SetActiveCursor(cursor);
}
@@ -521,7 +521,7 @@
gfx::Point p;
ConvertPointToMouseHandler(e.location(), &p);
- MouseEvent mouse_event(e.GetType(), p.x(), p.y(), e.GetFlags());
+ MouseEvent mouse_event(e.type(), p.x(), p.y(), e.flags());
return mouse_pressed_handler_->ProcessMouseDragged(mouse_event, &drag_info);
}
return false;
@@ -533,7 +533,7 @@
if (mouse_pressed_handler_) {
gfx::Point p;
ConvertPointToMouseHandler(e.location(), &p);
- MouseEvent mouse_released(e.GetType(), p.x(), p.y(), e.GetFlags());
+ MouseEvent mouse_released(e.type(), p.x(), p.y(), e.flags());
// We allow the view to delete us from ProcessMouseReleased. As such,
// configure state such that we're done first, then call View.
View* mouse_pressed_handler = mouse_pressed_handler_;
@@ -576,7 +576,7 @@
mouse_move_handler_->OnMouseMoved(moved_event);
gfx::NativeCursor cursor = mouse_move_handler_->GetCursorForPoint(
- moved_event.GetType(), moved_event.location());
+ moved_event.type(), moved_event.location());
SetActiveCursor(cursor);
} else if (mouse_move_handler_ != NULL) {
MouseEvent exited_event(Event::ET_MOUSE_EXITED, 0, 0, 0);
@@ -680,18 +680,18 @@
View* v = GetFocusedView();
// Special case to handle right-click context menus triggered by the
// keyboard.
- if (v && v->IsEnabled() && ((event.GetKeyCode() == ui::VKEY_APPS) ||
- (event.GetKeyCode() == ui::VKEY_F10 && event.IsShiftDown()))) {
+ if (v && v->IsEnabled() && ((event.key_code() == ui::VKEY_APPS) ||
+ (event.key_code() == ui::VKEY_F10 && event.IsShiftDown()))) {
v->ShowContextMenu(v->GetKeyboardContextMenuLocation(), false);
return true;
}
for (; v && v != this && !consumed; v = v->parent()) {
- consumed = (event.GetType() == Event::ET_KEY_PRESSED) ?
+ consumed = (event.type() == Event::ET_KEY_PRESSED) ?
v->OnKeyPressed(event) : v->OnKeyReleased(event);
}
if (!consumed && default_keyboard_handler_) {
- consumed = (event.GetType() == Event::ET_KEY_PRESSED) ?
+ consumed = (event.type() == Event::ET_KEY_PRESSED) ?
default_keyboard_handler_->OnKeyPressed(event) :
default_keyboard_handler_->OnKeyReleased(event);
}
@@ -758,7 +758,7 @@
}
void RootView::SetMouseLocationAndFlags(const MouseEvent& e) {
- last_mouse_event_flags_ = e.GetFlags();
+ last_mouse_event_flags_ = e.flags();
last_mouse_event_x_ = e.x();
last_mouse_event_y_ = e.y();
}

Powered by Google App Engine
This is Rietveld 408576698