| Index: ui/chromeos/touch_exploration_controller.cc
|
| diff --git a/ui/chromeos/touch_exploration_controller.cc b/ui/chromeos/touch_exploration_controller.cc
|
| index 07ed6b2f95ff35db5a00b4acd6612fd9605ef258..985779fab79b6e87892c73cb3298da4be935e64f 100644
|
| --- a/ui/chromeos/touch_exploration_controller.cc
|
| +++ b/ui/chromeos/touch_exploration_controller.cc
|
| @@ -19,7 +19,9 @@
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| #define SET_STATE(state) SetState(state, __func__)
|
| -#define VLOG_EVENT(event) if (VLOG_IS_ON(0)) VlogEvent(event, __func__)
|
| +#define VLOG_EVENT(event) \
|
| + if (VLOG_IS_ON(1)) \
|
| + VlogEvent(event, __func__)
|
|
|
| namespace ui {
|
|
|
| @@ -73,7 +75,7 @@ ui::EventRewriteStatus TouchExplorationController::RewriteEvent(
|
| if (!event.IsTouchEvent()) {
|
| if (event.IsKeyEvent()) {
|
| const ui::KeyEvent& key_event = static_cast<const ui::KeyEvent&>(event);
|
| - VLOG(0) << "\nKeyboard event: " << key_event.name()
|
| + VLOG(1) << "\nKeyboard event: " << key_event.name()
|
| << "\n Key code: " << key_event.key_code()
|
| << ", Flags: " << key_event.flags()
|
| << ", Is char: " << key_event.is_char();
|
| @@ -160,7 +162,7 @@ ui::EventRewriteStatus TouchExplorationController::RewriteEvent(
|
| FindEdgesWithinBounds(touch_event.location(), kLeavingScreenEdge) !=
|
| NO_EDGE) {
|
| if (VLOG_on_)
|
| - VLOG(0) << "Leaving screen";
|
| + VLOG(1) << "Leaving screen";
|
|
|
| // Indicates to the user that they are leaving the screen.
|
| delegate_->PlayExitScreenEarcon();
|
| @@ -168,7 +170,7 @@ ui::EventRewriteStatus TouchExplorationController::RewriteEvent(
|
| if (current_touch_ids_.size() == 0) {
|
| SET_STATE(NO_FINGERS_DOWN);
|
| if (VLOG_on_) {
|
| - VLOG(0) << "Reset to no fingers in Rewrite event because the touch "
|
| + VLOG(1) << "Reset to no fingers in Rewrite event because the touch "
|
| "release or cancel was on the edge of the screen.";
|
| }
|
| return ui::EVENT_REWRITE_DISCARD;
|
| @@ -330,7 +332,7 @@ ui::EventRewriteStatus TouchExplorationController::InSingleTapPressed(
|
| (event.time_stamp() - initial_press_->time_stamp()).InSecondsF();
|
| float velocity = distance / delta_time;
|
| if (VLOG_on_) {
|
| - VLOG(0) << "\n Delta time: " << delta_time << "\n Distance: " << distance
|
| + VLOG(1) << "\n Delta time: " << delta_time << "\n Distance: " << distance
|
| << "\n Velocity of click: " << velocity
|
| << "\n Minimum swipe velocity: "
|
| << gesture_detector_config_.minimum_swipe_velocity;
|
| @@ -898,7 +900,7 @@ void TouchExplorationController::SideSlideControl(ui::GestureEvent* gesture) {
|
| float ratio = (location.y() - kMaxDistanceFromEdge) / volume_adjust_height;
|
| float volume = 100 - 100 * ratio;
|
| if (VLOG_on_) {
|
| - VLOG(0) << "\n Volume = " << volume
|
| + VLOG(1) << "\n Volume = " << volume
|
| << "\n Location = " << location.ToString()
|
| << "\n Bounds = " << root_window_->bounds().right();
|
| }
|
| @@ -913,7 +915,7 @@ void TouchExplorationController::OnSwipeEvent(ui::GestureEvent* swipe_gesture) {
|
| GestureEventDetails event_details = swipe_gesture->details();
|
| int num_fingers = event_details.touch_points();
|
| if (VLOG_on_)
|
| - VLOG(0) << "\nSwipe with " << num_fingers << " fingers.";
|
| + VLOG(1) << "\nSwipe with " << num_fingers << " fingers.";
|
|
|
| ui::AXGesture gesture = ui::AX_GESTURE_NONE;
|
| if (event_details.swipe_left()) {
|
| @@ -1026,7 +1028,7 @@ void TouchExplorationController::DispatchKeyWithFlags(
|
| DispatchEvent(&key_down);
|
| DispatchEvent(&key_up);
|
| if (VLOG_on_) {
|
| - VLOG(0) << "\nKey down: key code : " << key_down.key_code()
|
| + VLOG(1) << "\nKey down: key code : " << key_down.key_code()
|
| << ", flags: " << key_down.flags()
|
| << "\nKey up: key code : " << key_up.key_code()
|
| << ", flags: " << key_up.flags();
|
| @@ -1118,7 +1120,7 @@ void TouchExplorationController::VlogState(const char* function_name) {
|
| return;
|
| prev_state_ = state_;
|
| const char* state_string = EnumStateToString(state_);
|
| - VLOG(0) << "\n Function name: " << function_name
|
| + VLOG(1) << "\n Function name: " << function_name
|
| << "\n State: " << state_string;
|
| }
|
|
|
| @@ -1143,8 +1145,7 @@ void TouchExplorationController::VlogEvent(const ui::TouchEvent& touch_event,
|
| const gfx::PointF& location = touch_event.location_f();
|
| const int touch_id = touch_event.touch_id();
|
|
|
| - VLOG(0) << "\n Function name: " << function_name
|
| - << "\n Event Type: " << type
|
| + VLOG(1) << "\n Function name: " << function_name << "\n Event Type: " << type
|
| << "\n Location: " << location.ToString()
|
| << "\n Touch ID: " << touch_id;
|
| prev_event_.reset(new TouchEvent(touch_event));
|
|
|