Bootstrapping: Display Bluetooth name of CrOS device on OOBE screen.

chrome/browser/chromeos/login/version_info_updater.cc

 // Copyright (c) 2012 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/version_info_updater.h"
 
 #include <vector>
 
 #include "ash/strings/grit/ash_strings.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/system/statistics_provider.h"
 #include "components/version_info/version_info.h"
+#include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 
 namespace {
 
 const char* const kReportingFlags[] = {
   chromeos::kReportDeviceVersionInfo,
   chromeos::kReportDeviceActivityTimes,
   chromeos::kReportDeviceBootMode,
   chromeos::kReportDeviceLocation,
 };
 
 // Strings used to generate the serial number part of the version string.
 const char kSerialNumberPrefix[] = "SN:";
 
+// Strings used to generate the bluetooth device name.
+const char kBluetoothDeviceNamePrefix[] = "Bluetooth device name: ";

[achuithb, 2017/05/17 00:02:50]

nit newline after this.

This doesn't need to be localized, right?

[xdai1, 2017/05/17 23:55:43]

I don't think it needs to be localized, especially the string is only visible
for a very small amount of users.

 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // VersionInfoUpdater public:
 
 VersionInfoUpdater::VersionInfoUpdater(Delegate* delegate)
     : cros_settings_(chromeos::CrosSettings::Get()),
       delegate_(delegate),
       weak_pointer_factory_(this) {
 }
@@ skipping 33 matching lines @@
   }
 
   // Watch for changes to the reporting flags.
   base::Closure callback =
       base::Bind(&VersionInfoUpdater::UpdateEnterpriseInfo,
                  base::Unretained(this));
   for (unsigned int i = 0; i < arraysize(kReportingFlags); ++i) {
     subscriptions_.push_back(
         cros_settings_->AddSettingsObserver(kReportingFlags[i], callback));
   }
+
+  UpdateDeviceInfo();
 }
 
 void VersionInfoUpdater::UpdateVersionLabel() {
   if (version_text_.empty())
     return;
 
   UpdateSerialNumberInfo();
 
   std::string label_text = l10n_util::GetStringFUTF8(
       IDS_LOGIN_VERSION_LABEL_FORMAT,
@@ skipping 34 matching lines @@
     serial_number_text_ = kSerialNumberPrefix;
     serial_number_text_.append(serial);
   }
 }
 
 void VersionInfoUpdater::OnVersion(const std::string& version) {
   version_text_ = version;
   UpdateVersionLabel();
 }
 
+void VersionInfoUpdater::UpdateDeviceInfo() {

[achuithb, 2017/05/17 00:02:50]

Why not get rid of this function since it's just one line?

[xdai1, 2017/05/17 23:55:43]

Done.

+  device::BluetoothAdapterFactory::GetAdapter(base::Bind(
+      &VersionInfoUpdater::OnGetAdapter, weak_pointer_factory_.GetWeakPtr()));
+}
+
+void VersionInfoUpdater::OnGetAdapter(
+    scoped_refptr<device::BluetoothAdapter> adapter) {
+  if (delegate_ && adapter->IsDiscoverable() && !adapter->GetName().empty()) {
+    std::string bluetooth_name_text = kBluetoothDeviceNamePrefix;
+    bluetooth_name_text.append(adapter->GetName());
+    delegate_->OnDeviceInfoUpdated(bluetooth_name_text);

[achuithb, 2017/05/17 00:02:50]

Why not
delegate_->OnDeviceInfoUpdated(kBluetoothDeviceNamePrefix + adapter->GetName());

[xdai1, 2017/05/17 23:55:44]

Done.

+  }
+}
+
 void VersionInfoUpdater::OnStoreLoaded(policy::CloudPolicyStore* store) {
   UpdateEnterpriseInfo();
 }
 
 void VersionInfoUpdater::OnStoreError(policy::CloudPolicyStore* store) {
   UpdateEnterpriseInfo();
 }
 
 }  // namespace chromeos