Remove MediaSettingChangedInfobar and show latest state in bubble

chrome/browser/content_settings/tab_specific_content_settings.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_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 27 matching lines @@
 
 // This class manages state about permissions, content settings, cookies and
 // site data for a specific WebContents. It tracks which content was accessed
 // and which content was blocked. Based on this it provides information about
 // which types of content were accessed and blocked.
 class TabSpecificContentSettings
     : public content::WebContentsObserver,
       public content_settings::Observer,
       public content::WebContentsUserData<TabSpecificContentSettings> {
  public:
-  enum MicrophoneCameraState {
-    MICROPHONE_CAMERA_NOT_ACCESSED = 0,
-    MICROPHONE_ACCESSED,
-    CAMERA_ACCESSED,
-    MICROPHONE_CAMERA_ACCESSED,
-    MICROPHONE_BLOCKED,
-    CAMERA_BLOCKED,
-    MICROPHONE_CAMERA_BLOCKED,
-  };
+  // Fields describing the current mic/camera state. If a page has attempted to
+  // access a device, the XXX_ACCESSED bit will be set. If access was blocked,
+  // XXX_BLOCKED will be set.
+  typedef uint32_t MicrophoneCameraState;
+  static const MicrophoneCameraState MICROPHONE_CAMERA_NOT_ACCESSED = 0;
+  static const MicrophoneCameraState MICROPHONE_ACCESSED = 1 << 0;
+  static const MicrophoneCameraState MICROPHONE_BLOCKED = 1 << 1;
+  static const MicrophoneCameraState CAMERA_ACCESSED = 1 << 2;
+  static const MicrophoneCameraState CAMERA_BLOCKED = 1 << 3;
 
   // Classes that want to be notified about site data events must implement
   // this abstract class and add themselves as observer to the
   // |TabSpecificContentSettings|.
   class SiteDataObserver {
    public:
     explicit SiteDataObserver(
         TabSpecificContentSettings* tab_specific_content_settings);
     virtual ~SiteDataObserver();
 
@@ skipping 137 matching lines @@
   }
 
   const std::string& media_stream_requested_audio_device() const {
     return media_stream_requested_audio_device_;
   }
 
   const std::string& media_stream_requested_video_device() const {
     return media_stream_requested_video_device_;
   }
 
+  const std::string& media_stream_selected_audio_device() const {
+    return media_stream_selected_audio_device_;
+  }
+
+  const std::string& media_stream_selected_video_device() const {
+    return media_stream_selected_video_device_;
+  }
+
   // Returns the state of the camera and microphone usage.
   MicrophoneCameraState GetMicrophoneCameraState() const;
 
+  // Returns whether the state of the camera and microphone usage or device has
+  // changed.
+  bool IsMicrophoneCameraStateChanged() const;
+
   // Returns the ContentSettingsUsagesState that controls the
   // geolocation API usage on this page.
   const ContentSettingsUsagesState& geolocation_usages_state() const {
     return geolocation_usages_state_;
   }
 
   // Returns the ContentSettingsUsageState that controls the MIDI usage on
   // this page.
   const ContentSettingsUsagesState& midi_usages_state() const {
     return midi_usages_state_;
@@ skipping 179 matching lines @@
   ContentSetting pending_protocol_handler_setting_;
 
   // Stores whether the user can load blocked plugins on this page.
   bool load_plugins_link_enabled_;
 
   // The origin of the media stream request. Note that we only support handling
   // settings for one request per tab. The latest request's origin will be
   // stored here. http://crbug.com/259794
   GURL media_stream_access_origin_;
 
+  // The microphone and camera state at the last media stream request.
+  // This value is composed of MicrophoneCameraState values.
+  MicrophoneCameraState microphone_camera_state_;
+  // The selected devices at the last media stream request.
+  std::string media_stream_selected_audio_device_;
+  std::string media_stream_selected_video_device_;
+
   // The devices to be displayed in the media bubble when the media stream
   // request is requesting certain specific devices.
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_