Dismiss EME infobar when WebMediaPlayer is destroyed.

chrome/browser/content_settings/permission_queue_controller.cc

 // Copyright 2013 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/content_settings/permission_queue_controller.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_infobar_delegate.h"
@@ skipping 158 matching lines @@
     if (i->id().Equals(id)) {
       if (i->has_infobar())
         GetInfoBarService(id)->RemoveInfoBar(i->infobar());
       else
         pending_infobar_requests_.erase(i);
       return;
     }
   }
 }
 
+void PermissionQueueController::CancelInfoBarRequests(int group_id) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+
+  PendingInfoBarRequests infobars_to_remove;

[xhwang, 2013/12/30 19:00:59]

s/infobars_to_remove/info_bar_requests_to_cancel/

[Kibeom Kim (inactive), 2013/12/30 21:52:24]

Done.

+  for (PendingInfoBarRequests::iterator i(pending_infobar_requests_.begin());

[xhwang, 2013/12/30 19:00:59]

nit: InfoBar/info_bar or Infobar/infobar. Now the function name uses InfoBar but
the variable is infobar.

[xhwang, 2013/12/30 19:00:59]

nit: typically we use PendingInfoBarRequests::iterator i =
pending_infobar_requests_.begin()...

[Kibeom Kim (inactive), 2013/12/30 21:52:24]

Done. (seems InfoBar naming is largely inconsistent, e.g., infobar_service.h &
InfoBarService, anyways, at least in this file I changed everything to info_bar)

+       i != pending_infobar_requests_.end();) {
+    LOG(ERROR) << "KKIM: "
+               << "CancelInfoBarRequests  PermissionRequestID == "
+               << i->id().ToString();

[xhwang, 2013/12/30 19:00:59]

Remove? Or at least not to use LOG(ERROR) and KKIM :)

[Kibeom Kim (inactive), 2013/12/30 21:52:24]

Done. :)

+    if (i->id().group_id() == group_id) {
+      if (i->has_infobar()) {
+        infobars_to_remove.push_back(*i);

[xhwang, 2013/12/30 19:00:59]

Can we call GetInfoBarService(i->id())->RemoveInfoBar(i->infobar()) directly
here instead of pushing it to another vector?

[Kibeom Kim (inactive), 2013/12/30 21:52:24]

I tried that first, but then, at RemoveInfoBar(..), the next pending infobar was
shown. So it's safe to erase all the pending infobars before we call
RemoveInfoBar. Then, I realized what I'm doing here is similar to 
PermissionQueueController::OnPermissionSet(...) so I followed that logic.

[xhwang, 2013/12/30 21:59:39]

worth a comment?

[Kibeom Kim (inactive), 2013/12/30 22:10:09]

Done.

+        ++i;

[xhwang, 2013/12/30 19:00:59]

do we need to pending_infobar_requests_.erase(i) in this case as well?

[Kibeom Kim (inactive), 2013/12/30 21:52:24]

When the infobar is removed, it's pending_infobar_requests_.erase(i) is called
in PermissionQueueController::Observe(...).

[xhwang, 2013/12/30 21:59:39]

worth a comment?

[Kibeom Kim (inactive), 2013/12/30 22:10:09]

Done.

+      } else {
+        i = pending_infobar_requests_.erase(i);
+      }
+    } else {
+      ++i;
+    }
+  }
+
+  for (PendingInfoBarRequests::iterator i = infobars_to_remove.begin();
+       i != infobars_to_remove.end();
+       ++i) {
+    GetInfoBarService(i->id())->RemoveInfoBar(i->infobar());
+  }
+}
+
 void PermissionQueueController::OnPermissionSet(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     bool update_content_setting,
     bool allowed) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   if (update_content_setting)
     UpdateContentSetting(requesting_frame, embedder, allowed);
@@ skipping 154 matching lines @@
 
   ContentSetting content_setting =
       allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
   profile_->GetHostContentSettingsMap()->SetContentSetting(
       ContentSettingsPattern::FromURLNoWildcard(requesting_frame.GetOrigin()),
       ContentSettingsPattern::FromURLNoWildcard(embedder.GetOrigin()),
       type_,
       std::string(),
       content_setting);
 }