Site Settings Desktop: Implement media picker for camera/mic categories.

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

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 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/options/media_devices_selection_handler.h"
+#include "chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/prefs/pref_service.h"
 
 namespace {
 
 const char kAudio[] = "mic";
 const char kVideo[] = "camera";
 
 }  // namespace
 
-namespace options {
+namespace settings {
 
-MediaDevicesSelectionHandler::MediaDevicesSelectionHandler() {}
+MediaDevicesSelectionHandler::MediaDevicesSelectionHandler(
+    content::WebUI* webui)

[michaelpg, 2016/06/07 16:03:30]

just take a Profile* instead

[Finnur, 2016/06/07 16:48:24]

Done.

+    : profile_(Profile::FromWebUI(webui)), initialized_(false) {
+}
 
 MediaDevicesSelectionHandler::~MediaDevicesSelectionHandler() {
-  MediaCaptureDevicesDispatcher::GetInstance()->RemoveObserver(this);
+  if (initialized_)

[michaelpg, 2016/06/07 16:03:30]

can this be a ScopedObserver instead of checking initialized_?

[Finnur, 2016/06/07 16:48:23]

Actually, that's not a bad idea. Done.

+    MediaCaptureDevicesDispatcher::GetInstance()->RemoveObserver(this);
 }
 
-void MediaDevicesSelectionHandler::GetLocalizedValues(
-    base::DictionaryValue* values) {
-  DCHECK(values);
-
-  static OptionsStringResource resources[] = {
-    { "mediaSelectMicLabel", IDS_MEDIA_SELECTED_MIC_LABEL },
-    { "mediaSelectCameraLabel", IDS_MEDIA_SELECTED_CAMERA_LABEL },
-  };
-
-  RegisterStrings(values, resources, arraysize(resources));
+void MediaDevicesSelectionHandler::OnJavascriptAllowed() {
 }
 
-void MediaDevicesSelectionHandler::InitializePage() {
-  // Register to the device observer list to get up-to-date device lists.
-  MediaCaptureDevicesDispatcher::GetInstance()->AddObserver(this);
-
-  // Update the device selection menus.
-  UpdateDevicesMenuForType(AUDIO);
-  UpdateDevicesMenuForType(VIDEO);
+void MediaDevicesSelectionHandler::OnJavascriptDisallowed() {
 }
 
 void MediaDevicesSelectionHandler::RegisterMessages() {
+  web_ui()->RegisterMessageCallback("getDefaultCaptureDevices",
+      base::Bind(&MediaDevicesSelectionHandler::GetDefaultCaptureDevices,
+                 base::Unretained(this)));
   web_ui()->RegisterMessageCallback("setDefaultCaptureDevice",
       base::Bind(&MediaDevicesSelectionHandler::SetDefaultCaptureDevice,
                  base::Unretained(this)));
 }
 
 void MediaDevicesSelectionHandler::OnUpdateAudioDevices(
     const content::MediaStreamDevices& devices) {
   UpdateDevicesMenu(AUDIO, devices);
 }
 
 void MediaDevicesSelectionHandler::OnUpdateVideoDevices(
     const content::MediaStreamDevices& devices) {
   UpdateDevicesMenu(VIDEO, devices);
 }
 
+void MediaDevicesSelectionHandler::GetDefaultCaptureDevices(
+    const base::ListValue* args) {
+  if (!initialized_) {

[michaelpg, 2016/06/07 16:03:30]

if (!scoped_observer_->IsObserving...

[Finnur, 2016/06/07 16:48:24]

Acknowledged.

+    // Register to the device observer list to get up-to-date device lists.
+    MediaCaptureDevicesDispatcher::GetInstance()->AddObserver(this);
+    initialized_ = true;
+  }
+
+  DCHECK_EQ(1U, args->GetSize());
+  std::string type;
+  if (!args->GetString(0, &type)) {
+    NOTREACHED();
+    return;
+  }
+  DCHECK(!type.empty());
+
+  if (type == kAudio)
+    UpdateDevicesMenuForType(AUDIO);
+  else if (type == kVideo)
+    UpdateDevicesMenuForType(VIDEO);
+}
+
 void MediaDevicesSelectionHandler::SetDefaultCaptureDevice(
     const base::ListValue* args) {
+  DCHECK(initialized_);
   DCHECK_EQ(2U, args->GetSize());
   std::string type, device;
   if (!(args->GetString(0, &type) && args->GetString(1, &device))) {
     NOTREACHED();
     return;
   }
 
   DCHECK(!type.empty());
   DCHECK(!device.empty());
 
   Profile* profile = Profile::FromWebUI(web_ui());

[michaelpg, 2016/06/07 16:03:30]

profile_

[Finnur, 2016/06/07 16:48:23]

Done.

   PrefService* prefs = profile->GetPrefs();
   if (type == kAudio)
     prefs->SetString(prefs::kDefaultAudioCaptureDevice, device);
   else if (type == kVideo)
     prefs->SetString(prefs::kDefaultVideoCaptureDevice, device);
   else
     NOTREACHED();
 }
 
 void MediaDevicesSelectionHandler::UpdateDevicesMenu(
     DeviceType type, const content::MediaStreamDevices& devices) {
+  AllowJavascript();
+
   // Get the default device unique id from prefs.
-  Profile* profile = Profile::FromWebUI(web_ui());
-  PrefService* prefs = profile->GetPrefs();
+  PrefService* prefs = profile_->GetPrefs();
   std::string default_device;
   std::string device_type;
   switch (type) {
     case AUDIO:
       default_device = prefs->GetString(prefs::kDefaultAudioCaptureDevice);
       device_type = kAudio;
       break;
     case VIDEO:
       default_device = prefs->GetString(prefs::kDefaultVideoCaptureDevice);
       device_type = kVideo;
@@ skipping 12 matching lines @@
       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);
-  web_ui()->CallJavascriptFunction("ContentSettings.updateDevicesMenu",
-                                   type_value,
-                                   device_list,
-                                   default_value);
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::StringValue("updateDevicesMenu"),
+                         type_value,
+                         device_list,
+                         default_value);
 }
 
 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 options
+}  // namespace settings