Adding device selection menus to the content setting bubble

chrome/browser/ui/content_settings/content_setting_media_menu_model.cc

Index: chrome/browser/ui/content_settings/content_setting_media_menu_model.cc
diff --git a/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc b/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2f800fe982840f25e5fd918f108dd151ab8e180c
--- /dev/null
+++ b/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc
@@ -0,0 +1,76 @@
+// 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.
+
+#include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"
+
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/media/media_capture_devices_dispatcher.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
+#include "chrome/common/pref_names.h"
+
+ContentSettingMediaMenuModel::ContentSettingMediaMenuModel(
+    Profile* profile,
+    content::MediaStreamType type,
+    ContentSettingBubbleModel* bubble_model,
+    const MenuLabelChangedCallback& callback)
+    : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
+      profile_(profile),

[Peter Kasting, 2013/02/06 22:11:18]

You shouldn't be taking a Profile* when you depend on a PrefService*.  Take a
PrefService* directly.

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+      type_(type),
+      media_bubble_model_(bubble_model),
+      callback_(callback) {
+  DCHECK_EQ(CONTENT_SETTINGS_TYPE_MEDIASTREAM,
+            media_bubble_model_->content_type());
+  BuildMenu();
+}
+
+ContentSettingMediaMenuModel::~ContentSettingMediaMenuModel() {
+}
+
+bool ContentSettingMediaMenuModel::IsCommandIdChecked(int command_id) const {
+  return false;
+}
+
+bool ContentSettingMediaMenuModel::IsCommandIdEnabled(int command_id) const {
+  return true;
+}
+
+bool ContentSettingMediaMenuModel::GetAcceleratorForCommandId(
+    int command_id,
+    ui::Accelerator* accelerator) {
+  return false;
+}
+
+void ContentSettingMediaMenuModel::ExecuteCommand(int command_id) {
+  CommandMap::const_iterator it = commands_.find(command_id);
+  DCHECK(it != commands_.end());
+  media_bubble_model_->OnMediaMenuClicked(type_, it->second.id);
+
+  if (!callback_.is_null())
+    callback_.Run(type_, it->second.name);
+}
+
+void ContentSettingMediaMenuModel::BuildMenu() {
+  PrefService* prefs = profile_->GetPrefs();
+  MediaCaptureDevicesDispatcher* dispatcher =
+      MediaCaptureDevicesDispatcher::GetInstance();
+  content::MediaStreamDevices devices;
+  std::string default_device;
+  if (type_ == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
+    devices = dispatcher->GetAudioCaptureDevices();
+    default_device = prefs->GetString(prefs::kDefaultAudioCaptureDevice);
+  } else if (type_ == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
+    devices = dispatcher->GetVideoCaptureDevices();
+    default_device = prefs->GetString(prefs::kDefaultVideoCaptureDevice);
+  } else {
+    NOTREACHED();

[Peter Kasting, 2013/02/06 22:11:18]

Nit: Simpler:

  if (type_ == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
    ...
  } else {
    DCHECK_EQ(content::MEDIA_DEVICE_VIDEO_CAPTURE, type_);
    ...
  }

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

[no longer working on chromium, 2013/02/07 16:25:19]

Done, I moved the DCHECK to the constructor.

+  }
+
+  for (size_t i = 0; i < devices.size(); ++i) {
+    int command_id = commands_.size();

[Peter Kasting, 2013/02/06 22:11:18]

Nit: Inline into next statement

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+    commands_.insert(std::make_pair(command_id, devices[i]));
+    AddItem(i, UTF8ToUTF16(devices[i].name));
+  }
+}