Show meaningful name for cameras

chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc

 // Copyright 2016 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/ui/webui/settings/settings_media_devices_selection_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/pref_service.h"
+#include "extensions/strings/grit/extensions_strings.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const char kAudio[] = "mic";
 const char kVideo[] = "camera";
 
 }  // namespace
 
 namespace settings {
 
@@ skipping 86 matching lines @@
       default_device = prefs->GetString(prefs::kDefaultVideoCaptureDevice);
       device_type = kVideo;
       break;
   }
 
   // Build the list of devices to send to JS.
   std::string default_id;
   base::ListValue device_list;
   for (size_t i = 0; i < devices.size(); ++i) {
     std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue());
-    entry->SetString("name", devices[i].name);
+    entry->SetString("name", GetDeviceDisplayName(devices[i]));
     entry->SetString("id",  devices[i].id);
     device_list.Append(std::move(entry));
     if (devices[i].id == default_device)
       default_id = default_device;
   }
 
   // Use the first device as the default device if the preferred default device
   // does not exist in the OS.
   if (!devices.empty() && default_id.empty())
     default_id = devices[0].id;
 
   base::StringValue default_value(default_id);
   base::StringValue type_value(device_type);
   CallJavascriptFunction("cr.webUIListenerCallback",
                          base::StringValue("updateDevicesMenu"),
                          type_value,
                          device_list,
                          default_value);
 }
 
+std::string MediaDevicesSelectionHandler::GetDeviceDisplayName(
+    const content::MediaStreamDevice& device) {
+  std::string facing_info;
+  switch (device.video_facing) {
+    case media::VideoFacingMode::MEDIA_VIDEO_FACING_USER:
+      facing_info = l10n_util::GetStringUTF8(IDS_CAMERA_FACING_USER);
+      break;
+    case media::VideoFacingMode::MEDIA_VIDEO_FACING_ENVIRONMENT:
+      facing_info = l10n_util::GetStringUTF8(IDS_CAMERA_FACING_ENVIRONMENT);
+      break;
+    case media::VideoFacingMode::MEDIA_VIDEO_FACING_NONE:
+    case media::VideoFacingMode::NUM_MEDIA_VIDEO_FACING_MODES:
+      break;

[mtomasz, 2017/03/02 07:49:53]

ditto

[shenghao, 2017/03/02 12:43:41]

Done.

+  }
+
+  if (facing_info.empty())

[mtomasz, 2017/03/02 07:49:53]

ditto

[mtomasz, 2017/03/02 07:49:53]

This string will never be empty. Can we have a DCHECK instead?

[shenghao, 2017/03/02 12:43:41]

It would be empty in the MEDIA_VIDEO_FACING_NONE case.

+    return device.name;
+  return device.name + " (" + facing_info + ")";

[mtomasz, 2017/03/02 07:49:53]

ditto

[shenghao, 2017/03/02 12:43:41]

Done.

+}
+
 void MediaDevicesSelectionHandler::UpdateDevicesMenuForType(DeviceType type) {
   content::MediaStreamDevices devices;
   switch (type) {
     case AUDIO:
       devices = MediaCaptureDevicesDispatcher::GetInstance()->
           GetAudioCaptureDevices();
       break;
     case VIDEO:
       devices = MediaCaptureDevicesDispatcher::GetInstance()->
           GetVideoCaptureDevices();
       break;
   }
 
   UpdateDevicesMenu(type, devices);
 }
 
 }  // namespace settings