add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

chrome/browser/media/media_stream_devices_menu_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_MENU_MODEL_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_MENU_MODEL_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "content/public/common/media_stream_request.h"
 #include "ui/base/models/simple_menu_model.h"
 
 class MediaStreamInfoBarDelegate;
 
 // A menu model that builds the contents of the devices menu in the media stream
 // infobar. This menu has only one level (no submenus).
 class MediaStreamDevicesMenuModel : public ui::SimpleMenuModel,
                                     public ui::SimpleMenuModel::Delegate {
  public:
-  explicit MediaStreamDevicesMenuModel(
-      const MediaStreamInfoBarDelegate* delegate);
+  explicit MediaStreamDevicesMenuModel(MediaStreamInfoBarDelegate* delegate);
   virtual ~MediaStreamDevicesMenuModel();
 
   // Returns the |device_id| for the selected device of type |type|. Returns
   // true if a selected device of the requested |type| was found, and false if
   // none was found, in which case |device_id| remains untouched.
   bool GetSelectedDeviceId(
       content::MediaStreamDeviceType type,
       std::string* device_id) const;
 
+  bool IsAlwaysAllowChecked() { return always_allow_; }

[tommi (sloooow) - chröme, 2012/06/11 20:59:21]

bool always_allow() const?

[no longer working on chromium, 2012/06/14 13:03:25]

Done.

+
   // ui::SimpleMenuModel::Delegate implementation:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
  private:
   typedef std::map<int, content::MediaStreamDevice> CommandMap;
 
   // Internal method to add the |devices| to the current menu.
   void AddDevices(const content::MediaStreamDevices& devices);
 
+  // Internal method to add "always" and "never" options to the current menu.
+  void AddAlwaysAndNeverOptions(bool audio, bool video);
+
   // Map of command IDs to devices.
   CommandMap commands_;
 
+  MediaStreamInfoBarDelegate* media_stream_delegate_;

[tommi (sloooow) - chröme, 2012/06/11 20:59:21]

document ownership

[no longer working on chromium, 2012/06/14 13:03:25]

Uncleaned debugging code. Remove now.

+
   // These are the command IDs (key of above |commands_| map) of the selected
   // devices entries in the menu, or -1 if there is no selected ID.
   int selected_command_id_audio_;
   int selected_command_id_video_;
 
+  bool always_allow_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesMenuModel);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_MENU_MODEL_H_