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

content/browser/renderer_host/media/video_capture_manager.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_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 315 matching lines @@
   // Detach client from controller.
   media::VideoCaptureSessionId session_id =
       controller->RemoveClient(client_id, client_handler);
   DVLOG(1) << "VideoCaptureManager::StopCaptureForClient, session_id = "
            << session_id;
 
   // If controller has no more clients, delete controller and device.
   DestroyDeviceEntryIfNoClients(entry);
 }
 
+void VideoCaptureManager::AbortCaptureForDeviceError(
+    VideoCaptureController* controller,
+    VideoCaptureControllerID client_id,
+    VideoCaptureControllerEventHandler* client_handler) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK(controller);
+  DCHECK(client_handler);
+
+  DeviceEntry* entry = GetDeviceEntryForController(controller);
+  if (!entry) {
+    NOTREACHED();
+    return;
+  }
+
+  std::map<media::VideoCaptureSessionId, MediaStreamDevice>::iterator it;

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

nit: This data type std::map<media::VideoCaptureSessionId, MediaStreamDevice>
is broadly used in VCM, what about a private typedef for it? I 
understand it'd cover other parts of the code, too.

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

Done.

+  for (it = sessions_.begin(); it != sessions_.end(); ++it) {
+    if (it->second.type == entry->stream_type &&
+        it->second.id == entry->id)
+      break;
+  }
+

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

nit: no blank line?

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

Done.

+  listener_->Aborted(it->second.type, it->first);

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

What happens if it->second.{id,type} has not been found?

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

Done.

+
+  StopCaptureForClient(controller, client_id, client_handler);

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

StopCaptureForClient() has overlapping boilerplate code, i.e. DCHECKs
and GetDeviceEntryForController()+check. Can we not reorganise it
somehow?

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

Done.

+}
+
 bool VideoCaptureManager::GetDeviceSupportedFormats(
     media::VideoCaptureSessionId capture_session_id,
     media::VideoCaptureFormats* supported_formats) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(supported_formats->empty());
 
   std::map<media::VideoCaptureSessionId, MediaStreamDevice>::iterator it =
       sessions_.find(capture_session_id);
   if (it == sessions_.end())
     return false;
@@ skipping 214 matching lines @@
     if (device_info.type == device->stream_type &&
         device_info.id == device->id) {
       return device;
     }
   }
   return NULL;
 }
 
 VideoCaptureManager::DeviceEntry*
 VideoCaptureManager::GetDeviceEntryForController(
-    const VideoCaptureController* controller) {
+    const VideoCaptureController* controller) const {
   // Look up |controller| in |devices_|.
-  for (DeviceEntries::iterator it = devices_.begin();
+  for (DeviceEntries::const_iterator it = devices_.begin();
        it != devices_.end(); ++it) {
     if ((*it)->video_capture_controller.get() == controller) {
       return *it;
     }
   }
   return NULL;
 }
 
 void VideoCaptureManager::DestroyDeviceEntryIfNoClients(DeviceEntry* entry) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 70 matching lines @@
 void VideoCaptureManager::SaveDesktopCaptureWindowIdOnDeviceThread(
     media::VideoCaptureSessionId session_id,
     gfx::NativeViewId window_id) {
   DCHECK(IsOnDeviceThread());
   DCHECK(notification_window_ids_.find(session_id) ==
          notification_window_ids_.end());
   notification_window_ids_[session_id] = window_id;
 }
 
 }  // namespace content