Skip to content

GitLab

T
tangled
Commit a3cbdfc5 authored by isherman's avatar isherman Committed by Commit bot
Browse files
Options

[Cleanup] Move the Easy Unlock metrics files out of the chromeos directory. 

This is a cleanup change in preparation for [ http://crbug.com/450509 ], where
metrics will be logged in non-ChromeOS-only code.

BUG=450509
TEST=compiles
R=tengs@chromium.org

Review URL: https://codereview.chromium.org/887093004

Cr-Commit-Position: refs/heads/master@{#314759}
parent 8787ad84
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 42 deletions
chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.cc → chrome/browser/signin/easy_unlock_metrics.cc
View file @ a3cbdfc5
......@@ -2,12 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h"
#include "chrome/browser/signin/easy_unlock_metrics.h"
#include "base/logging.h"
#include "base/metrics/histogram.h"
namespace chromeos {
#include "base/metrics/histogram_macros.h"
void RecordEasyUnlockLoginEvent(EasyUnlockLoginEvent event) {
DCHECK_LT(event, EASY_SIGN_IN_LOGIN_EVENT_COUNT);
......@@ -16,5 +14,3 @@ void RecordEasyUnlockLoginEvent(EasyUnlockLoginEvent event) {
event,
EASY_SIGN_IN_LOGIN_EVENT_COUNT);
}
} // namespace chromeos
chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h → chrome/browser/signin/easy_unlock_metrics.h
View file @ a3cbdfc5
......@@ -2,10 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_METRICS_H_
#define CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_METRICS_H_
namespace chromeos {
#ifndef CHROME_BROWSER_SIGNIN_EASY_UNLOCK_METRICS_H_
#define CHROME_BROWSER_SIGNIN_EASY_UNLOCK_METRICS_H_
// Tracking login events for Easy unlock metrics.
// This enum is used to define the buckets for an enumerated UMA histogram.
......@@ -43,7 +41,7 @@ enum EasyUnlockLoginEvent {
PASSWORD_SIGN_IN_RSSI_TOO_LOW = 12,
// Password is used for sign-in because phone is not supported.
PASSWORD_SIGN_IN_PHONE_UNSUPPORTED = 13,
// Password is used for sign-in because user types in passowrd. This is
// Password is used for sign-in because user types in password. This is
// unlikely to happen though.
PASSWORD_SIGN_IN_WITH_AUTHENTICATED_PHONE = 14,
// Password is used for sign-in because phone is not right next to the
......@@ -62,11 +60,9 @@ enum EasyUnlockLoginEvent {
// right next to the Chromebook.
PASSWORD_SIGN_IN_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH = 19,
EASY_SIGN_IN_LOGIN_EVENT_COUNT // Must be the last.
EASY_SIGN_IN_LOGIN_EVENT_COUNT // Must be the last entry.
};
void RecordEasyUnlockLoginEvent(EasyUnlockLoginEvent event);
} // namespace chromeos
#endif // CHROME_BROWSER_CHROMEOS_LOGIN_EASY_UNLOCK_EASY_UNLOCK_METRICS_H_
#endif // CHROME_BROWSER_SIGNIN_EASY_UNLOCK_METRICS_H_
chrome/browser/signin/easy_unlock_service_signin_chromeos.cc
View file @ a3cbdfc5
......@@ -13,8 +13,8 @@
#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_metrics.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
#include "chrome/browser/signin/easy_unlock_metrics.h"
#include "chromeos/login/auth/user_context.h"
#include "chromeos/tpm/tpm_token_loader.h"
......@@ -174,9 +174,8 @@ void EasyUnlockServiceSignin::RecordEasySignInOutcome(
bool success) const {
DCHECK_EQ(GetUserEmail(), user_id);
chromeos::RecordEasyUnlockLoginEvent(success
? chromeos::EASY_SIGN_IN_SUCCESS
: chromeos::EASY_SIGN_IN_FAILURE);
RecordEasyUnlockLoginEvent(
success ? EASY_SIGN_IN_SUCCESS : EASY_SIGN_IN_FAILURE);
DVLOG(1) << "Easy sign-in " << (success ? "success" : "failure");
}
......@@ -186,11 +185,10 @@ void EasyUnlockServiceSignin::RecordPasswordLoginEvent(
if (GetUserEmail() != user_id)
return;
chromeos::EasyUnlockLoginEvent event =
chromeos::EASY_SIGN_IN_LOGIN_EVENT_COUNT;
EasyUnlockLoginEvent event = EASY_SIGN_IN_LOGIN_EVENT_COUNT;
if (!GetRemoteDevices() ||
GetHardlockState() == EasyUnlockScreenlockStateHandler::NO_PAIRING) {
event = chromeos::PASSWORD_SIGN_IN_NO_PAIRING;
event = PASSWORD_SIGN_IN_NO_PAIRING;
} else if (GetHardlockState() !=
EasyUnlockScreenlockStateHandler::NO_HARDLOCK) {
switch (GetHardlockState()) {
......@@ -199,63 +197,63 @@ void EasyUnlockServiceSignin::RecordPasswordLoginEvent(
NOTREACHED();
break;
case EasyUnlockScreenlockStateHandler::USER_HARDLOCK:
event = chromeos::PASSWORD_SIGN_IN_USER_HARDLOCK;
event = PASSWORD_SIGN_IN_USER_HARDLOCK;
break;
case EasyUnlockScreenlockStateHandler::PAIRING_CHANGED:
event = chromeos::PASSWORD_SIGN_IN_PAIRING_CHANGED;
event = PASSWORD_SIGN_IN_PAIRING_CHANGED;
break;
case EasyUnlockScreenlockStateHandler::LOGIN_FAILED:
event = chromeos::PASSWORD_SIGN_IN_LOGIN_FAILED;
event = PASSWORD_SIGN_IN_LOGIN_FAILED;
break;
case EasyUnlockScreenlockStateHandler::PAIRING_ADDED:
event = chromeos::PASSWORD_SIGN_IN_PAIRING_ADDED;
event = PASSWORD_SIGN_IN_PAIRING_ADDED;
break;
}
} else if (!screenlock_state_handler()) {
event = chromeos::PASSWORD_SIGN_IN_NO_SCREENLOCK_STATE_HANDLER;
event = PASSWORD_SIGN_IN_NO_SCREENLOCK_STATE_HANDLER;
} else {
switch (screenlock_state_handler()->state()) {
case EasyUnlockScreenlockStateHandler::STATE_INACTIVE:
event = chromeos::PASSWORD_SIGN_IN_SERVICE_NOT_ACTIVE;
event = PASSWORD_SIGN_IN_SERVICE_NOT_ACTIVE;
break;
case EasyUnlockScreenlockStateHandler::STATE_NO_BLUETOOTH:
event = chromeos::PASSWORD_SIGN_IN_NO_BLUETOOTH;
event = PASSWORD_SIGN_IN_NO_BLUETOOTH;
break;
case EasyUnlockScreenlockStateHandler::STATE_BLUETOOTH_CONNECTING:
event = chromeos::PASSWORD_SIGN_IN_BLUETOOTH_CONNECTING;
event = PASSWORD_SIGN_IN_BLUETOOTH_CONNECTING;
break;
case EasyUnlockScreenlockStateHandler::STATE_NO_PHONE:
event = chromeos::PASSWORD_SIGN_IN_NO_PHONE;
event = PASSWORD_SIGN_IN_NO_PHONE;
break;
case EasyUnlockScreenlockStateHandler::STATE_PHONE_NOT_AUTHENTICATED:
event = chromeos::PASSWORD_SIGN_IN_PHONE_NOT_AUTHENTICATED;
event = PASSWORD_SIGN_IN_PHONE_NOT_AUTHENTICATED;
break;
case EasyUnlockScreenlockStateHandler::STATE_PHONE_LOCKED:
event = chromeos::PASSWORD_SIGN_IN_PHONE_LOCKED;
event = PASSWORD_SIGN_IN_PHONE_LOCKED;
break;
case EasyUnlockScreenlockStateHandler::STATE_PHONE_UNLOCKABLE:
event = chromeos::PASSWORD_SIGN_IN_PHONE_NOT_LOCKABLE;
event = PASSWORD_SIGN_IN_PHONE_NOT_LOCKABLE;
break;
case EasyUnlockScreenlockStateHandler::STATE_PHONE_UNSUPPORTED:
event = chromeos::PASSWORD_SIGN_IN_PHONE_UNSUPPORTED;
event = PASSWORD_SIGN_IN_PHONE_UNSUPPORTED;
break;
case EasyUnlockScreenlockStateHandler::STATE_RSSI_TOO_LOW:
event = chromeos::PASSWORD_SIGN_IN_RSSI_TOO_LOW;
event = PASSWORD_SIGN_IN_RSSI_TOO_LOW;
break;
case EasyUnlockScreenlockStateHandler::STATE_TX_POWER_TOO_HIGH:
event = chromeos::PASSWORD_SIGN_IN_TX_POWER_TOO_HIGH;
event = PASSWORD_SIGN_IN_TX_POWER_TOO_HIGH;
break;
case EasyUnlockScreenlockStateHandler::
STATE_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH:
event = chromeos::PASSWORD_SIGN_IN_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH;
event = PASSWORD_SIGN_IN_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH;
break;
case EasyUnlockScreenlockStateHandler::STATE_AUTHENTICATED:
event = chromeos::PASSWORD_SIGN_IN_WITH_AUTHENTICATED_PHONE;
event = PASSWORD_SIGN_IN_WITH_AUTHENTICATED_PHONE;
break;
}
}
chromeos::RecordEasyUnlockLoginEvent(event);
RecordEasyUnlockLoginEvent(event);
DVLOG(1) << "EasySignIn password login event, event=" << event;
}
......
chrome/chrome_browser.gypi
View file @ a3cbdfc5
......@@ -1311,6 +1311,8 @@
'browser/search/hotword_service_factory.h',
'browser/signin/easy_unlock_auth_attempt.cc',
'browser/signin/easy_unlock_auth_attempt.h',
'browser/signin/easy_unlock_metrics.cc',
'browser/signin/easy_unlock_metrics.h',
'browser/signin/easy_unlock_screenlock_state_handler.cc',
'browser/signin/easy_unlock_screenlock_state_handler.h',
'browser/signin/easy_unlock_service.cc',
......
chrome/chrome_browser_chromeos.gypi
View file @ a3cbdfc5
......@@ -429,8 +429,6 @@
'browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h',
'browser/chromeos/login/easy_unlock/easy_unlock_refresh_keys_operation.cc',
'browser/chromeos/login/easy_unlock/easy_unlock_refresh_keys_operation.h',
'browser/chromeos/login/easy_unlock/easy_unlock_metrics.cc',
'browser/chromeos/login/easy_unlock/easy_unlock_metrics.h',
'browser/chromeos/login/easy_unlock/easy_unlock_reauth.cc',
'browser/chromeos/login/easy_unlock/easy_unlock_reauth.h',
'browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.cc',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment