Migrate Chrome OS Bluetooth UI to the new discovery API.

chrome/browser/ui/ash/system_tray_delegate_chromeos.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
 
 #include "ash/ime/input_method_menu_manager.h"
 #include "ash/session_state_observer.h"
 #include "ash/system/tray/system_tray.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/login/login_state.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_discovery_session.h"
 
 namespace chromeos {
 
 class SystemTrayDelegateChromeOS
     : public ash::ime::InputMethodMenuManager::Observer,
       public ash::SystemTrayDelegate,
       public SessionManagerClient::Observer,
       public drive::JobListObserver,
       public content::NotificationObserver,
       public input_method::InputMethodManager::Observer,
@@ skipping 173 matching lines @@
                                      bool powered) OVERRIDE;
   virtual void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter,
                                          bool discovering) OVERRIDE;
   virtual void DeviceAdded(device::BluetoothAdapter* adapter,
                            device::BluetoothDevice* device) OVERRIDE;
   virtual void DeviceChanged(device::BluetoothAdapter* adapter,
                              device::BluetoothDevice* device) OVERRIDE;
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
                              device::BluetoothDevice* device) OVERRIDE;
 
+  void OnStartDiscoverySession(

[Daniel Erat, 2014/02/28 21:22:36]

nit: mind renaming this to something like OnStartBluetoothDiscoverySession? it
seems a bit vaguely-named otherwise

[armansito, 2014/02/28 22:52:02]

Done.

+      scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
+
   // Overridden from SystemKeyEventListener::CapsLockObserver.
   virtual void OnCapsLockChange(bool enabled) OVERRIDE;
 
   void UpdateEnterpriseDomain();
 
   // Overridden from CloudPolicyStore::Observer
   virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE;
   virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE;
   // Overridden from ash::SessionStateObserver
   virtual void UserAddedToSession(const std::string& user_id) OVERRIDE;
 
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
 
   base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
   scoped_ptr<content::NotificationRegistrar> registrar_;
   scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
   scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
   Profile* user_profile_;
   base::HourClockType clock_type_;
   int search_key_mapped_to_;
   bool screen_locked_;
   bool have_session_start_time_;
   base::TimeTicks session_start_time_;
   bool have_session_length_limit_;
   base::TimeDelta session_length_limit_;
   std::string enterprise_domain_;
+  bool bluetooth_should_discover_;

[Daniel Erat, 2014/02/28 21:22:36]

nit: rename to something like "do_bluetooth_discovery_" or
"should_do_bluetooth_discovery_"

[armansito, 2014/02/28 22:52:02]

Done.

 
   scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
+  scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
   scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
   scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
   scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
 };
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
 
 }  // namespace chromeos
 #endif  // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_