Fix for closing the desktop sharing notification bar when the shared window is closed

content/browser/renderer_host/media/video_capture_host.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 "content/browser/renderer_host/media/video_capture_host.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
@@ skipping 159 matching lines @@
 
 void VideoCaptureHost::DoHandleErrorOnIOThread(
     const VideoCaptureControllerID& controller_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (entries_.find(controller_id) == entries_.end())
     return;
 
   Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
                                         VIDEO_CAPTURE_STATE_ERROR));
-  DeleteVideoCaptureControllerOnIOThread(controller_id);
+

[mcasas, 2014/04/24 11:09:47]

All platforms/implementations will basically pass by a cycle of
AbortCaptureForDeviceError() before doing the expected 
StopCaptureForClient().

We could instead add a param to VideoCaptureDevice::Client::OnError()
to distinguish... ?

[jiayl, 2014/04/24 18:11:13]

Not sure I understand you. Does the refactored code still have the problem?
Could you elaborate?

On 2014/04/24 11:09:47, mcasas wrote:

[mcasas, 2014/04/25 17:18:35]

I think is gone.

On 2014/04/24 18:11:13, jiayl wrote:

+  EntryMap::iterator it = entries_.find(controller_id);
+  if (it == entries_.end())
+    return;
+
+  if (it->second) {
+    media_stream_manager_->video_capture_manager()->AbortCaptureForDeviceError(
+        it->second.get(), controller_id, this);
+  }
+  entries_.erase(it);
 }

[mcasas, 2014/04/24 11:09:47]

This is just a copy-modify-1-word of DeleteVideoCaptureControllerOnIOThread()
l.355, please refactor those two pieces of code.

[jiayl, 2014/04/24 18:11:13]

Done.

 
 void VideoCaptureHost::DoEndedOnIOThread(
     const VideoCaptureControllerID& controller_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "VideoCaptureHost::DoEndedOnIOThread";
   if (entries_.find(controller_id) == entries_.end())
     return;
 
   Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
                                         VIDEO_CAPTURE_STATE_ENDED));
@@ skipping 160 matching lines @@
     return;
 
   if (it->second) {
     media_stream_manager_->video_capture_manager()->StopCaptureForClient(
         it->second.get(), controller_id, this);
   }
   entries_.erase(it);
 }
 
 }  // namespace content