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 193 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 settings have

[Peter Kasting, 2014/09/22 23:11:23]

Nit: Remove "the state of", or else change "have" to "has"

It's also slightly inconsistent that here we refer to the "state of the
settings" but elsewhere (e.g. down below) it's more of a reference to the "state
of the microphone and camera" (no "settings").  The state of the devices and the
state of our settings for the devices are two different things.  Be clear and
consistent.

[robwu, 2014/09/24 00:03:04]

Done.

+  // changed since the last media stream request.
+  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.
+  MicrophoneCameraState microphone_camera_state_;
+  // The most selected devices at the the of the media stream request.

[Peter Kasting, 2014/09/22 23:11:23]

Nit: "most selected"?

[robwu, 2014/09/24 00:03:04]

Done.

+  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_