Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: chrome/browser/ui/content_settings/content_setting_media_menu_model.cc

Issue 12208010: Adding device selection menus to the content setting bubble (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Used callback instead of inheriting from a virtual interface Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..1752c6e112ef375f3968fbee1728864f2abde8ae
--- /dev/null
+++ b/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc
@@ -0,0 +1,78 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
tfarina 2013/02/06 14:56:08 no (c), the new copyright doesn't have it. crbug.
no longer working on chromium 2013/02/06 21:30:06 Done.
+// 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/browser/ui/content_settings/content_setting_media_menu_model.h"
tfarina 2013/02/06 14:56:08 nit: this is the same include of line 5.
no longer working on chromium 2013/02/06 21:30:06 Done.
+#include "chrome/common/pref_names.h"
+
tfarina 2013/02/06 14:56:08 nit: extra blank line
no longer working on chromium 2013/02/06 21:30:06 Done.
+
+ContentSettingMediaMenuModel::ContentSettingMediaMenuModel(
+ Profile* profile,
+ content::MediaStreamType type,
+ ContentSettingBubbleModel* bubble_model,
+ const MenuLabelChangedCallback& callback)
+ : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
+ profile_(profile),
+ 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();
+ }
+
+ for (size_t i = 0; i < devices.size(); ++i) {
+ int command_id = commands_.size();
+ commands_.insert(std::make_pair(command_id, devices[i]));
+ AddItem(i, UTF8ToUTF16(devices[i].name));
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698