UMA metrics added for HID detection dialog.

chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.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 "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "base/metrics/histogram.h"
+#include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "chrome/common/pref_names.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const char kJsScreenPath[] = "login.HIDDetectionScreen";
 
 // Variants of pairing state.
@@ skipping 36 matching lines @@
 
 namespace chromeos {
 
 HIDDetectionScreenHandler::HIDDetectionScreenHandler()
     : BaseScreenHandler(kJsScreenPath),
       delegate_(NULL),
       show_on_init_(false),
       mouse_is_pairing_(false),
       keyboard_is_pairing_(false),
       switch_on_adapter_when_ready_(false),
-      skip_screen_if_devices_present_(true),
+      first_time_screen_show_(true),
       weak_ptr_factory_(this) {
 }
 
 HIDDetectionScreenHandler::~HIDDetectionScreenHandler() {
   if (adapter_.get())
     adapter_->RemoveObserver(this);
   input_service_proxy_.RemoveObserver(this);
   if (delegate_)
     delegate_->OnActorDestroyed(this);
 }
@@ skipping 11 matching lines @@
 
 void HIDDetectionScreenHandler::FindDevicesError() {
   VLOG(1) << "Failed to start Bluetooth discovery.";
 }
 
 void HIDDetectionScreenHandler::Show() {
   if (!page_is_ready()) {
     show_on_init_ = true;
     return;
   }
+  PrefService* const local_state = g_browser_process->local_state();
+  int num_of_times_dialog_was_shown = local_state->GetInteger(
+      prefs::kTimesHIDDialogShown);
+  local_state->SetInteger(prefs::kTimesHIDDialogShown,
+                          num_of_times_dialog_was_shown + 1);
+
   input_service_proxy_.AddObserver(this);
-  skip_screen_if_devices_present_ = true;
+  first_time_screen_show_ = true;
   UpdateDevices();
   ShowScreen(OobeUI::kScreenHIDDetection, NULL);
 }
 
 void HIDDetectionScreenHandler::Hide() {
   if (adapter_.get())
     adapter_->RemoveObserver(this);
   input_service_proxy_.RemoveObserver(this);
 }
 
 void HIDDetectionScreenHandler::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
   if (page_is_ready())
     Initialize();
 }
 
+// static

[ygorshenin1, 2014/05/14 09:35:36]

Move this method after OnInputDeviceRemoved() (follow the order in header file).

[merkulova, 2014/05/14 13:11:05]

Done.

+void HIDDetectionScreenHandler::RegisterPrefs(PrefRegistrySimple* registry) {
+  registry->RegisterIntegerPref(prefs::kTimesHIDDialogShown, 0);
+}
+
 void HIDDetectionScreenHandler::DeclareLocalizedValues(
     LocalizedValuesBuilder* builder) {
   builder->Add("hidDetectionContinue", IDS_HID_DETECTION_CONTINUE_BUTTON);
   builder->Add("hidDetectionInvitation", IDS_HID_DETECTION_INVITATION_TEXT);
   builder->Add("hidDetectionPrerequisites",
       IDS_HID_DETECTION_PRECONDITION_TEXT);
   builder->Add("hidDetectionMouseSearching", IDS_HID_DETECTION_SEARCHING_MOUSE);
   builder->Add("hidDetectionKeyboardSearching",
       IDS_HID_DETECTION_SEARCHING_KEYBOARD);
   builder->Add("hidDetectionUSBMouseConnected",
@@ skipping 18 matching lines @@
     show_on_init_ = false;
   }
 }
 
 void HIDDetectionScreenHandler::RegisterMessages() {
   AddCallback(
       "HIDDetectionOnContinue", &HIDDetectionScreenHandler::HandleOnContinue);
 }
 
 void HIDDetectionScreenHandler::HandleOnContinue() {
+  if (!first_time_screen_show_) {
+    // Continue button pressed.
+    int scenario_type;
+    if (!pointing_device_id_.empty() && !keyboard_device_id_.empty())
+      scenario_type = hid::All_DEVICES_DETECTED;
+    else if (pointing_device_id_.empty())
+      scenario_type = hid::KEYBOARD_DEVICE_ONLY_DETECTED;
+    else
+      scenario_type = hid::POINTING_DEVICE_ONLY_DETECTED;
+
+    UMA_HISTOGRAM_ENUMERATION(
+        "HIDDetection.OOBEDevicesDetectedOnContinuePressed",
+        scenario_type,
+        hid::CONTINUE_SCENARIO_TYPE_SIZE);
+  } else {
+    // Screen not shown as devices were autodetected.
+    PrefService* local_state = g_browser_process->local_state();
+    int num_of_times_dialog_was_shown = local_state->GetInteger(
+        prefs::kTimesHIDDialogShown);
+    local_state->SetInteger(prefs::kTimesHIDDialogShown,

[ygorshenin1, 2014/05/14 09:35:36]

After discussion: could you please get rid of this "-1" logic? If possible, fix
this in this CL, otherwise add a TODO comment.

[merkulova, 2014/05/14 13:11:05]

Done.

+                            num_of_times_dialog_was_shown - 1);
+  }
   if (delegate_)
     delegate_->OnExit();
 }
 
 void HIDDetectionScreenHandler::InitializeAdapter(
     scoped_refptr<device::BluetoothAdapter> adapter) {
   adapter_ = adapter;
   CHECK(adapter_.get());
 
   adapter_->AddObserver(this);
@@ skipping 197 matching lines @@
       pointing_device_connect_type_ = it->type;
       SendPointingDeviceNotification();
     }
     if (keyboard_device_id_.empty() && it->is_keyboard) {
       keyboard_device_id_ = it->id;
       keyboard_device_name_ = it->name;
       keyboard_device_connect_type_ = it->type;
       SendKeyboardDeviceNotification(NULL);
     }
   }
-  // Skip screen if both devices are present and skip was requested.
-  if (!pointing_device_id_.empty() &&
-      !keyboard_device_id_.empty() &&
-      skip_screen_if_devices_present_) {
-    HandleOnContinue();
+
+  if (first_time_screen_show_) {
+    // Skip screen if both devices are present and it's first show.
+    bool all_devices_autodetected = !pointing_device_id_.empty() &&
+                                    !keyboard_device_id_.empty();
+    UMA_HISTOGRAM_BOOLEAN("HIDDetection.OOBEDialogShown",
+                          !all_devices_autodetected);
+    if (all_devices_autodetected)
+      HandleOnContinue();
   }
-  // Skip requested only once on dialog show.
-  skip_screen_if_devices_present_ = false;
+
+  first_time_screen_show_ = false;
   if ((pointing_device_id_.empty() || keyboard_device_id_.empty()) &&
       adapter_) {
     if (!adapter_->IsPresent()) {
       // Switch on BT adapter later when it's available.
       switch_on_adapter_when_ready_ = true;
     } else if (!adapter_->IsPowered()) {
       adapter_->SetPowered(
           true,
           base::Bind(&HIDDetectionScreenHandler::StartBTDiscoverySession,
                      weak_ptr_factory_.GetWeakPtr()),
@@ skipping 99 matching lines @@
         l10n_util::GetStringFUTF16(
             IDS_HID_DETECTION_PAIRED_BLUETOOTH_KEYBOARD,
             base::UTF8ToUTF16(keyboard_device_name_)));
   } else {
     state_info.SetString("state", kUSBConnectedState);
   }
   CallJS("setKeyboardDeviceState", state_info);
 }
 
 }  // namespace chromeos