Correctly record TouchView metrics on suspend/shutdown

ash/wm/maximize_mode/maximize_mode_controller.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
@@ skipping 163 matching lines @@
 
 void MaximizeModeController::LidEventReceived(bool open,
                                               const base::TimeTicks& time) {
   if (open)
     last_lid_open_time_ = time;
   lid_is_closed_ = !open;
   LeaveMaximizeMode();
 }
 
 void MaximizeModeController::SuspendImminent() {
-  RecordTouchViewStateTransition();
+  // Only record TouchView state transition metrics if the suspend occurred
+  // while in TouchView mode.
+  if (IsMaximizeModeWindowManagerEnabled())
+    RecordTouchViewStateTransition();

[flackr, 2015/02/10 21:32:11]

This looks like it will report touch view inactive durations for times when the
device was in touchview and suspended. The core issue is that
RecordTouchViewStateTransition assumes that we just had a state transition,
which isn't true on suspend.

[tdanderson, 2015/02/12 19:51:00]

Done.

 }
 
 void MaximizeModeController::SuspendDone(
     const base::TimeDelta& sleep_duration) {
   last_touchview_transition_time_ = base::Time::Now();
 }
 
 void MaximizeModeController::HandleHingeRotation(
     const chromeos::AccelerometerUpdate& update) {
   static const gfx::Vector3dF hinge_vector(1.0f, 0.0f, 0.0f);
@@ skipping 76 matching lines @@
 // their original position.
 void MaximizeModeController::OnMaximizeModeEnded() {
   RecordTouchViewStateTransition();
 }
 
 void MaximizeModeController::RecordTouchViewStateTransition() {
   if (CanEnterMaximizeMode()) {
     base::Time current_time = base::Time::Now();
     base::TimeDelta delta = current_time - last_touchview_transition_time_;
     if (IsMaximizeModeWindowManagerEnabled()) {
       UMA_HISTOGRAM_LONG_TIMES("Ash.TouchView.TouchViewInactive", delta);

[flackr, 2015/02/10 21:32:11]

Note: if suspending in maximize mode will report all of the time up until now as
having been TouchViewInactive.

[tdanderson, 2015/02/12 19:51:00]

Done.

       total_non_touchview_time_ += delta;
     } else {
       UMA_HISTOGRAM_LONG_TIMES("Ash.TouchView.TouchViewActive", delta);
       total_touchview_time_ += delta;
     }
     last_touchview_transition_time_ = current_time;
   }
 }
 
 void MaximizeModeController::OnAppTerminating() {
   if (CanEnterMaximizeMode()) {
-    RecordTouchViewStateTransition();
+    // Only record TouchView state transition metrics if shutdown occurred
+    // while in TouchView mode.
+    if (IsMaximizeModeWindowManagerEnabled())
+      RecordTouchViewStateTransition();
+
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchView.TouchViewActiveTotal",
         total_touchview_time_.InMinutes(),
         1, base::TimeDelta::FromDays(7).InMinutes(), 50);
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchView.TouchViewInactiveTotal",
         total_non_touchview_time_.InMinutes(),
         1, base::TimeDelta::FromDays(7).InMinutes(), 50);
     base::TimeDelta total_runtime = total_touchview_time_ +
         total_non_touchview_time_;
     if (total_runtime.InSeconds() > 0) {
       UMA_HISTOGRAM_PERCENTAGE("Ash.TouchView.TouchViewActivePercentage",
@@ skipping 12 matching lines @@
   return elapsed_time <= kLidRecentlyOpenedDuration;
 }
 
 void MaximizeModeController::SetTickClockForTest(
     scoped_ptr<base::TickClock> tick_clock) {
   DCHECK(tick_clock_);
   tick_clock_ = tick_clock.Pass();
 }
 
 }  // namespace ash