Replace MediaStreamUIController with MediaStreamUIProxy.

chrome/browser/media/media_capture_devices_dispatcher.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/media/media_capture_devices_dispatcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
 #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry_factory.h"
 #include "chrome/browser/media/audio_stream_indicator.h"
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/feature_switch.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/media_devices_monitor.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_source.h"
+#include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/media_stream_request.h"
 #include "extensions/common/constants.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 using content::MediaStreamDevices;
 
 namespace {
@@ skipping 35 matching lines @@
   return
       hexencoded_origin_hash == "3C2705BC432E7C51CA8553FDC5BEE873FF2468EE" ||
       hexencoded_origin_hash == "50F02B8A668CAB274527D58356F07C2143080FCC";
 #else
   return false;
 #endif
 }
 
 }  // namespace
 
+MediaCaptureDevicesDispatcher::PendingAccessRequest::PendingAccessRequest(
+    content::MediaStreamRequest request,
+    content::MediaResponseCallback callback)
+    : request(request),
+      callback(callback) {
+}
+
+MediaCaptureDevicesDispatcher::PendingAccessRequest::~PendingAccessRequest() {}
+
 MediaCaptureDevicesDispatcher* MediaCaptureDevicesDispatcher::GetInstance() {
   return Singleton<MediaCaptureDevicesDispatcher>::get();
 }
 
 MediaCaptureDevicesDispatcher::MediaCaptureDevicesDispatcher()
     : devices_enumerated_(false),
       media_stream_capture_indicator_(new MediaStreamCaptureIndicator()),
-      audio_stream_indicator_(new AudioStreamIndicator()) {}
+      audio_stream_indicator_(new AudioStreamIndicator()) {
+  notifications_registrar_.Add(
+      this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
+      content::NotificationService::AllSources());
+}
 
 MediaCaptureDevicesDispatcher::~MediaCaptureDevicesDispatcher() {}
 
 void MediaCaptureDevicesDispatcher::RegisterUserPrefs(
     PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kDefaultAudioCaptureDevice,
                                std::string(),
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kDefaultVideoCaptureDevice,
                                std::string(),
@@ skipping 28 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!devices_enumerated_) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&content::EnsureMonitorCaptureDevices));
     devices_enumerated_ = true;
   }
   return video_devices_;
 }
 
+void MediaCaptureDevicesDispatcher::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
+    content::WebContents* web_contents =
+        content::Source<content::WebContents>(source).ptr();
+    pending_requests_.erase(web_contents);
+  }
+}
+
 void MediaCaptureDevicesDispatcher::ProcessMediaAccessRequest(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback,
     const extensions::Extension* extension) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (request.video_type == content::MEDIA_SCREEN_VIDEO_CAPTURE) {
     ProcessScreenCaptureAccessRequest(web_contents, request, callback);
   } else if (extension) {
     // For extensions access is approved based on extension permissions.
     ProcessMediaAccessRequestFromExtension(
         web_contents, request, callback, extension);
   } else {
-    // For all regular media requests show infobar.
-    MediaStreamInfoBarDelegate::Create(web_contents, request, callback);
+    ProcessRegularMediaAccessRequest(web_contents, request, callback);
   }
 }
 
 void MediaCaptureDevicesDispatcher::ProcessScreenCaptureAccessRequest(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   content::MediaStreamDevices devices;
 
   bool screen_capture_enabled =
@@ skipping 80 matching lines @@
   }
 
   scoped_ptr<content::MediaStreamUI> ui;
   if (!devices.empty()) {
     ui = media_stream_capture_indicator_->RegisterMediaStream(
         web_contents, devices);
   }
   callback.Run(devices, ui.Pass());
 }
 
+void MediaCaptureDevicesDispatcher::ProcessRegularMediaAccessRequest(
+    content::WebContents* web_contents,
+    const content::MediaStreamRequest& request,
+    const content::MediaResponseCallback& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  RequestsQueue& queue(pending_requests_[web_contents]);

[tommi (sloooow) - chröme, 2013/04/22 13:22:39]

nit: since this is a reference use assignment. As is it looks like you're
constructing a new object until one notices the little ampersand in there.

[Sergey Ulanov, 2013/04/23 05:21:44]

Done.

+  queue.push(PendingAccessRequest(request, callback));
+
+  // If this is the only request then show the infobar.
+  if (queue.size() == 1)
+    ProcessQueuedAccessRequest(web_contents, queue.front());
+}
+
+void MediaCaptureDevicesDispatcher::ProcessQueuedAccessRequest(
+    content::WebContents* web_contents,
+    PendingAccessRequest& request) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  MediaStreamInfoBarDelegate::Create(
+      web_contents, request.request,
+      base::Bind(&MediaCaptureDevicesDispatcher::OnAccessRequestResponse,
+                 base::Unretained(this), web_contents));
+}
+
+void MediaCaptureDevicesDispatcher::OnAccessRequestResponse(
+    content::WebContents* web_contents,
+    const content::MediaStreamDevices& devices,
+    scoped_ptr<content::MediaStreamUI> ui) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  std::map<content::WebContents*, RequestsQueue>::iterator it =
+      pending_requests_.find(web_contents);
+  DCHECK(it != pending_requests_.end());
+  RequestsQueue& queue(it->second);
+  content::MediaResponseCallback callback = queue.front().callback;
+  queue.pop();
+  if (!queue.empty())
+    ProcessQueuedAccessRequest(web_contents, queue.front());
+
+  callback.Run(devices, ui.Pass());
+}
+
 void MediaCaptureDevicesDispatcher::GetDefaultDevicesForProfile(
     Profile* profile,
     bool audio,
     bool video,
     content::MediaStreamDevices* devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(audio || video);
 
   PrefService* prefs = profile->GetPrefs();
   std::string default_device;
@@ skipping 106 matching lines @@
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevice& device,
     content::MediaRequestState state) {
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnRequestUpdate(render_process_id,
                                     render_view_id,
                                     device,
                                     state));
 }