cros: Fold HIDDetectionModel into HIDDetectionScreen.

chrome/browser/chromeos/login/screens/hid_detection_screen.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/chromeos/login/screens/hid_detection_screen.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 31 matching lines @@
 
 bool DeviceIsKeyboard(device::BluetoothDeviceType device_type) {
   return device_type == device::BluetoothDeviceType::KEYBOARD ||
          device_type == device::BluetoothDeviceType::KEYBOARD_MOUSE_COMBO;
 }
 
 }  // namespace
 
 namespace chromeos {
 
+const char HIDDetectionScreen::kContextKeyKeyboardState[] = "keyboard-state";
+const char HIDDetectionScreen::kContextKeyMouseState[] = "mouse-state";
+const char HIDDetectionScreen::kContextKeyPinCode[] = "keyboard-pincode";
+const char HIDDetectionScreen::kContextKeyNumKeysEnteredExpected[] =
+    "num-keys-entered-expected";
+const char HIDDetectionScreen::kContextKeyNumKeysEnteredPinCode[] =
+    "num-keys-entered-pincode";
+const char HIDDetectionScreen::kContextKeyMouseDeviceName[] =
+    "mouse-device-name";
+const char HIDDetectionScreen::kContextKeyKeyboardDeviceName[] =
+    "keyboard-device-name";
+const char HIDDetectionScreen::kContextKeyKeyboardLabel[] =
+    "keyboard-device-label";
+const char HIDDetectionScreen::kContextKeyContinueButtonEnabled[] =
+    "continue-button-enabled";
+
 HIDDetectionScreen::HIDDetectionScreen(BaseScreenDelegate* base_screen_delegate,
                                        HIDDetectionView* view)
-    : HIDDetectionModel(base_screen_delegate),
+    : BaseScreen(base_screen_delegate, OobeScreen::SCREEN_OOBE_HID_DETECTION),
       view_(view),
       weak_ptr_factory_(this) {
   DCHECK(view_);
   if (view_)
-    view_->Bind(*this);
+    view_->Bind(this);
 
   device::BluetoothAdapterFactory::GetAdapter(base::Bind(
       &HIDDetectionScreen::InitializeAdapter, weak_ptr_factory_.GetWeakPtr()));
 }
 
 HIDDetectionScreen::~HIDDetectionScreen() {
   adapter_initially_powered_.reset();
   input_service_proxy_.RemoveObserver(this);
   if (view_)
     view_->Unbind();
   if (discovery_session_.get())
     discovery_session_->Stop(base::Bind(&base::DoNothing),
                              base::Bind(&base::DoNothing));
   if (adapter_.get())
     adapter_->RemoveObserver(this);
 }
 
-void HIDDetectionScreen::Show() {
-  showing_ = true;
-  GetContextEditor().SetBoolean(kContextKeyNumKeysEnteredExpected, false);
-  SendPointingDeviceNotification();
-  SendKeyboardDeviceNotification();
-
-  input_service_proxy_.AddObserver(this);
-  UpdateDevices();
-
-  if (view_)
-    view_->Show();
-}
-
-void HIDDetectionScreen::Hide() {
-  showing_ = false;
-  input_service_proxy_.RemoveObserver(this);
-  if (discovery_session_.get())
-    discovery_session_->Stop(base::Bind(&base::DoNothing),
-                             base::Bind(&base::DoNothing));
-  if (view_)
-    view_->Hide();
-}
-
 void HIDDetectionScreen::OnContinueButtonClicked() {
-
   ContinueScenarioType scenario_type;
   if (!pointing_device_id_.empty() && !keyboard_device_id_.empty())
     scenario_type = All_DEVICES_DETECTED;
   else if (pointing_device_id_.empty())
     scenario_type = KEYBOARD_DEVICE_ONLY_DETECTED;
   else
     scenario_type = POINTING_DEVICE_ONLY_DETECTED;
 
   UMA_HISTOGRAM_ENUMERATION(
       "HIDDetection.OOBEDevicesDetectedOnContinuePressed",
       scenario_type,
       CONTINUE_SCENARIO_TYPE_SIZE);
 
   // Switch off BT adapter if it was off before the screen and no BT device
   // connected.
   const bool adapter_is_powered =
       adapter_.get() && adapter_->IsPresent() && adapter_->IsPowered();
   const bool need_switching_off =
       adapter_initially_powered_ && !(*adapter_initially_powered_);
   if (adapter_is_powered && need_switching_off) {
     input_service_proxy_.GetDevices(
         base::Bind(&HIDDetectionScreen::OnGetInputDevicesForPowerOff,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   Finish(BaseScreenDelegate::HID_DETECTION_COMPLETED);
 }
 
+void HIDDetectionScreen::OnViewDestroyed(HIDDetectionView* view) {
+  if (view_ == view)
+    view_ = nullptr;
+}
+
 void HIDDetectionScreen::CheckIsScreenRequired(
       const base::Callback<void(bool)>& on_check_done) {
   input_service_proxy_.GetDevices(
       base::Bind(&HIDDetectionScreen::OnGetInputDevicesListForCheck,
                  weak_ptr_factory_.GetWeakPtr(),
                  on_check_done));
 }
 
-void HIDDetectionScreen::OnViewDestroyed(HIDDetectionView* view) {
-  if (view_ == view)
-    view_ = NULL;
+void HIDDetectionScreen::Show() {
+  showing_ = true;
+  GetContextEditor().SetBoolean(kContextKeyNumKeysEnteredExpected, false);
+  SendPointingDeviceNotification();
+  SendKeyboardDeviceNotification();
+
+  input_service_proxy_.AddObserver(this);
+  UpdateDevices();
+
+  if (view_)
+    view_->Show();
+}
+
+void HIDDetectionScreen::Hide() {
+  showing_ = false;
+  input_service_proxy_.RemoveObserver(this);
+  if (discovery_session_.get()) {
+    discovery_session_->Stop(base::Bind(&base::DoNothing),

[achuithb, 2017/01/18 23:19:46]

curious: do you need the base::Bind here?

[jdufault, 2017/01/20 18:57:21]

Yep; base::DoNothing is just an empty function.

[achuithb, 2017/01/20 19:18:38]

I meant, just passing in the function pointer doesn't work, right?

[jdufault, 2017/01/20 19:25:37]

Right :(

+                             base::Bind(&base::DoNothing));
+  }
+  if (view_)
+    view_->Hide();
 }
 
 void HIDDetectionScreen::RequestPinCode(device::BluetoothDevice* device) {
   VLOG(1) << "RequestPinCode id = " << device->GetDeviceID()
           << " name = " << device->GetNameForDisplay();
   device->CancelPairing();
 }
 
 void HIDDetectionScreen::RequestPasskey(device::BluetoothDevice* device) {
   VLOG(1) << "RequestPassKey id = " << device->GetDeviceID()
@@ skipping 395 matching lines @@
 scoped_refptr<device::BluetoothAdapter>
 HIDDetectionScreen::GetAdapterForTesting() {
   return adapter_;
 }
 
 void HIDDetectionScreen::SetAdapterInitialPoweredForTesting(bool powered) {
   adapter_initially_powered_.reset(new bool(powered));
 }
 
 }  // namespace chromeos