Remove MediaSettingChangedInfobar and show latest state in bubble

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

 // 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.
 
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
+#include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
-#include "chrome/browser/ui/content_settings/media_setting_changed_infobar_delegate.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 524 matching lines @@
                                        Profile* profile);
 
   virtual ~ContentSettingMediaStreamBubbleModel();
 
  private:
   void SetTitle();
   // Sets the data for the radio buttons of the bubble.
   void SetRadioGroup();
   // Sets the data for the media menus of the bubble.
   void SetMediaMenus();
+  void SetCustomLink();
   // Updates the camera and microphone setting with the passed |setting|.
   void UpdateSettings(ContentSetting setting);
   // Updates the camera and microphone default device with the passed |type|
   // and device.
   void UpdateDefaultDeviceForType(content::MediaStreamType type,
                                   const std::string& device);
 
   // ContentSettingBubbleModel implementation.
   virtual void OnRadioClicked(int radio_index) OVERRIDE;
   virtual void OnMediaMenuClicked(content::MediaStreamType type,
@@ skipping 22 matching lines @@
   radio_item_setting_[0] = CONTENT_SETTING_ASK;
   radio_item_setting_[1] = CONTENT_SETTING_BLOCK;
 
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents);
   state_ = content_settings->GetMicrophoneCameraState();
 
   SetTitle();
   SetRadioGroup();
   SetMediaMenus();
+  SetCustomLink();
 }
 
 ContentSettingMediaStreamBubbleModel::~ContentSettingMediaStreamBubbleModel() {
   // On some platforms (e.g. MacOS X) it is possible to close a tab while the
   // media stream bubble is open. This resets the web contents to NULL.
   if (!web_contents())
     return;
 
-  bool media_setting_changed = false;
   for (MediaMenuMap::const_iterator it = bubble_content().media_menus.begin();
       it != bubble_content().media_menus.end(); ++it) {
     if (it->second.selected_device.id != it->second.default_device.id) {
       UpdateDefaultDeviceForType(it->first, it->second.selected_device.id);
-      media_setting_changed = true;
     }
   }
 
   // Update the media settings if the radio button selection was changed.
   if (selected_item_ != bubble_content().radio_group.default_item) {
     UpdateSettings(radio_item_setting_[selected_item_]);
-    media_setting_changed = true;
-  }
-
-  // Trigger the reload infobar if the media setting has been changed.
-  if (media_setting_changed) {
-    MediaSettingChangedInfoBarDelegate::Create(
-        InfoBarService::FromWebContents(web_contents()));
   }
 }
 
 void ContentSettingMediaStreamBubbleModel::SetTitle() {
   int title_id = 0;
   switch (state_) {
     case TabSpecificContentSettings::MICROPHONE_CAMERA_NOT_ACCESSED:
       // If neither microphone nor camera stream was accessed, then there is no
       // icon didplayed in the omnibox and no settings bubble availbale. Hence
       // there is no title.
@@ skipping 30 matching lines @@
 
   base::string16 display_host_utf16;
   net::AppendFormattedHost(
       url,
       profile()->GetPrefs()->GetString(prefs::kAcceptLanguages),
       &display_host_utf16);
   std::string display_host(base::UTF16ToUTF8(display_host_utf16));
   if (display_host.empty())
     display_host = url.spec();
 
+  const bool is_mic_blocked = content_settings->IsContentBlocked(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
+  const bool is_cam_blocked = content_settings->IsContentBlocked(
+      CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
   int radio_allow_label_id = 0;
   int radio_block_label_id = 0;
   switch (state_) {
     case TabSpecificContentSettings::MICROPHONE_CAMERA_NOT_ACCESSED:
       NOTREACHED();
       return;
     case TabSpecificContentSettings::MICROPHONE_ACCESSED:
       radio_allow_label_id = IDS_ALLOWED_MEDIASTREAM_MIC_NO_ACTION;
       radio_block_label_id = IDS_ALLOWED_MEDIASTREAM_MIC_BLOCK;
-      selected_item_ = 0;
+      selected_item_ = is_mic_blocked ? 1 : 0;
       break;
     case TabSpecificContentSettings::CAMERA_ACCESSED:
       radio_allow_label_id = IDS_ALLOWED_MEDIASTREAM_CAMERA_NO_ACTION;
       radio_block_label_id = IDS_ALLOWED_MEDIASTREAM_CAMERA_BLOCK;
-      selected_item_ = 0;
+      selected_item_ = is_cam_blocked ? 1 : 0;
       break;
     case TabSpecificContentSettings::MICROPHONE_CAMERA_ACCESSED:
       radio_allow_label_id = IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION;
       radio_block_label_id = IDS_ALLOWED_MEDIASTREAM_MIC_AND_CAMERA_BLOCK;
-      selected_item_ = 0;
+      selected_item_ = is_mic_blocked || is_cam_blocked ? 1 : 0;
       break;
     case TabSpecificContentSettings::MICROPHONE_BLOCKED:
       if (url.SchemeIsSecure()) {
         radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_ALLOW;
         radio_item_setting_[0] = CONTENT_SETTING_ALLOW;
       } else {
         radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_ASK;
       }
 
       radio_block_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_NO_ACTION;
-      selected_item_ = 1;
+      selected_item_ = is_mic_blocked ? 1 : 0;
       break;
     case TabSpecificContentSettings::CAMERA_BLOCKED:
       if (url.SchemeIsSecure()) {
         radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_CAMERA_ALLOW;
         radio_item_setting_[0] = CONTENT_SETTING_ALLOW;
       } else {
         radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_CAMERA_ASK;
       }
 
       radio_block_label_id = IDS_BLOCKED_MEDIASTREAM_CAMERA_NO_ACTION;
-      selected_item_ = 1;
+      selected_item_ = is_cam_blocked ? 1 : 0;
       break;
     case TabSpecificContentSettings::MICROPHONE_CAMERA_BLOCKED:
       if (url.SchemeIsSecure()) {
         radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ALLOW;
         radio_item_setting_[0] = CONTENT_SETTING_ALLOW;
       } else {
         radio_allow_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_ASK;
       }
 
       radio_block_label_id = IDS_BLOCKED_MEDIASTREAM_MIC_AND_CAMERA_NO_ACTION;
-      selected_item_ = 1;
+      selected_item_ = is_mic_blocked || is_cam_blocked ? 1 : 0;
       break;
   }
 
   std::string radio_allow_label = l10n_util::GetStringFUTF8(
       radio_allow_label_id, base::UTF8ToUTF16(display_host));
   std::string radio_block_label =
       l10n_util::GetStringUTF8(radio_block_label_id);
 
   radio_group.default_item = selected_item_;
   radio_group.radio_items.push_back(radio_allow_label);
@@ skipping 118 matching lines @@
       }
 
       camera_menu.default_device =
           GetMediaDeviceById(preferred_camera, cameras);
       camera_menu.selected_device = camera_menu.default_device;
     }
     add_media_menu(content::MEDIA_DEVICE_VIDEO_CAPTURE, camera_menu);
   }
 }
 
+void ContentSettingMediaStreamBubbleModel::SetCustomLink() {

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

Nit: Instead of having this function set the link itself and return void, why
not have this be a "should have custom link" oracle that returns bool?

This will allow you to break the code below into more discrete conditionals for
readability, and declare temps like |prefs| right above first use.

+  TabSpecificContentSettings* content_settings =
+      TabSpecificContentSettings::FromWebContents(web_contents());
+  PrefService* prefs = profile()->GetPrefs();
+
+  if (content_settings->IsMicrophoneCameraStateChanged() ||
+      ((prefs->GetString(prefs::kDefaultAudioCaptureDevice) !=
+        content_settings->media_stream_selected_audio_device() ||
+        prefs->GetString(prefs::kDefaultVideoCaptureDevice) !=
+        content_settings->media_stream_selected_video_device()) &&
+       MediaCaptureDevicesDispatcher::GetInstance()->
+       GetMediaStreamCaptureIndicator()->
+       IsCapturingUserMedia(web_contents()))) {
+    // TODO(robwu): Rename the next resource ID (remove "INFOBAR").

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

Why not go ahead and do that in this change?  It's only going to affect another
file or two, isn't it?

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

Done.

+    set_custom_link(l10n_util::GetStringUTF8(
+            IDS_MEDIASTREAM_SETTING_CHANGED_INFOBAR_MESSAGE));

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

Nit: Bizarre indenting (should be 4)

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

Done.

+  }
+}
+
 void ContentSettingMediaStreamBubbleModel::OnRadioClicked(int radio_index) {
   selected_item_ = radio_index;
 }
 
 void ContentSettingMediaStreamBubbleModel::OnMediaMenuClicked(
     content::MediaStreamType type,
     const std::string& selected_device_id) {
   DCHECK(type == content::MEDIA_DEVICE_AUDIO_CAPTURE ||
          type == content::MEDIA_DEVICE_VIDEO_CAPTURE);
   DCHECK_EQ(1U, bubble_content().media_menus.count(type));
@@ skipping 433 matching lines @@
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     DCHECK_EQ(web_contents_,
               content::Source<WebContents>(source).ptr());
     web_contents_ = NULL;
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
     DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
     profile_ = NULL;
   }
 }