Merge 288079 "BT adapter is switched to initial state after HID ..."

chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h

Index: chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h
===================================================================
--- chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h	(revision 288696)
+++ chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h	(working copy)
@@ -170,6 +170,10 @@
   // all necessary devices (mouse and keyboard) already connected.
   void GetDevicesFirstTime();
 
+  // Called by device::BluetoothAdapter in response to a failure to
+  // power off BT adapter.
+  void SetPoweredOffError();
+
   // Called for revision of active devices. If current-placement is available
   // for mouse or keyboard device, sets one of active devices as current or
   // tries to connect some BT device if no appropriate devices are connected.
@@ -214,6 +218,9 @@
 
   bool first_time_screen_show_;
 
+  // State of BT adapter before screen-initiated changes.
+  scoped_ptr<bool> adapter_initially_powered_;
+
   base::WeakPtrFactory<HIDDetectionScreenHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(HIDDetectionScreenHandler);