[EasyUnlock] Observe proximity changes and clean up TX power strategy.

chrome/browser/signin/easy_unlock_screenlock_state_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/signin/easy_unlock_screenlock_state_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/strings/string16.h"
@@ skipping 13 matching lines @@
 
 proximity_auth::ScreenlockBridge::UserPodCustomIcon GetIconForState(
     ScreenlockState state) {
   switch (state) {
     case ScreenlockState::NO_BLUETOOTH:
     case ScreenlockState::NO_PHONE:
     case ScreenlockState::PHONE_NOT_AUTHENTICATED:
     case ScreenlockState::PHONE_LOCKED:
     case ScreenlockState::PHONE_NOT_LOCKABLE:
     case ScreenlockState::PHONE_UNSUPPORTED:
+      return proximity_auth::ScreenlockBridge::USER_POD_CUSTOM_ICON_LOCKED;
     case ScreenlockState::RSSI_TOO_LOW:
-      return proximity_auth::ScreenlockBridge::USER_POD_CUSTOM_ICON_LOCKED;
-    case ScreenlockState::TX_POWER_TOO_HIGH:
-    case ScreenlockState::PHONE_LOCKED_AND_TX_POWER_TOO_HIGH:
+    case ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW:
       // TODO(isherman): This icon is currently identical to the regular locked
       // icon.  Once the reduced proximity range flag is removed, consider
       // deleting the redundant icon.
       return proximity_auth::ScreenlockBridge::
           USER_POD_CUSTOM_ICON_LOCKED_WITH_PROXIMITY_HINT;
     case ScreenlockState::BLUETOOTH_CONNECTING:
       return proximity_auth::ScreenlockBridge::USER_POD_CUSTOM_ICON_SPINNER;
     case ScreenlockState::AUTHENTICATED:
       return proximity_auth::ScreenlockBridge::USER_POD_CUSTOM_ICON_UNLOCKED;
     case ScreenlockState::INACTIVE:
@@ skipping 20 matching lines @@
     case ScreenlockState::PHONE_NOT_AUTHENTICATED:
       return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_NOT_AUTHENTICATED;
     case ScreenlockState::PHONE_LOCKED:
       return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_LOCKED;
     case ScreenlockState::PHONE_NOT_LOCKABLE:
       return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_UNLOCKABLE;
     case ScreenlockState::PHONE_UNSUPPORTED:
       return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_UNSUPPORTED_ANDROID_VERSION;
     case ScreenlockState::RSSI_TOO_LOW:
       return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_RSSI_TOO_LOW;
-    case ScreenlockState::TX_POWER_TOO_HIGH:
-      return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_TX_POWER_TOO_HIGH;
-    case ScreenlockState::PHONE_LOCKED_AND_TX_POWER_TOO_HIGH:
-      return
-          IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_LOCKED_AND_TX_POWER_TOO_HIGH;
+    case ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW:
+      return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_PHONE_LOCKED_AND_RSSI_TOO_LOW;
     case ScreenlockState::AUTHENTICATED:
       return IDS_EASY_UNLOCK_SCREENLOCK_TOOLTIP_HARDLOCK_INSTRUCTIONS;
   }
 
   NOTREACHED();
   return 0;
 }
 
 bool TooltipContainsDeviceType(ScreenlockState state) {
   return (state == ScreenlockState::AUTHENTICATED ||
           state == ScreenlockState::PHONE_NOT_LOCKABLE ||
           state == ScreenlockState::NO_BLUETOOTH ||
           state == ScreenlockState::PHONE_UNSUPPORTED ||
-          state == ScreenlockState::TX_POWER_TOO_HIGH ||
-          state == ScreenlockState::PHONE_LOCKED_AND_TX_POWER_TOO_HIGH);
+          state == ScreenlockState::RSSI_TOO_LOW ||
+          state == ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW);
 }
 
 // Returns true iff the |state| corresponds to a locked remote device.
 bool IsLockedState(ScreenlockState state) {
   return (state == ScreenlockState::PHONE_LOCKED ||
-          state == ScreenlockState::PHONE_LOCKED_AND_TX_POWER_TOO_HIGH);
+          state == ScreenlockState::PHONE_LOCKED_AND_RSSI_TOO_LOW);
 }
 
 }  // namespace
 
 EasyUnlockScreenlockStateHandler::EasyUnlockScreenlockStateHandler(
     const AccountId& account_id,
     HardlockState initial_hardlock_state,
     proximity_auth::ScreenlockBridge* screenlock_bridge)
     : state_(ScreenlockState::INACTIVE),
       account_id_(account_id),
@@ skipping 275 matching lines @@
               IDS_EASY_UNLOCK_SCREENLOCK_USER_POD_AUTH_VALUE));
     }
   } else if (existing_auth_type !=
              proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD) {
     screenlock_bridge_->lock_handler()->SetAuthType(
         account_id_,
         proximity_auth::ScreenlockBridge::LockHandler::OFFLINE_PASSWORD,
         base::string16());
   }
 }