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

content/browser/renderer_host/media/media_stream_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/media_stream_manager.h"
 
 #include <list>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
 #endif
 
 namespace content {
 
 // Forward declaration of DeviceMonitorMac and its only useable method.
 class DeviceMonitorMac {
  public:
   void StartMonitoring(
-    const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner);
+      const scoped_refptr<base::SingleThreadTaskRunner>& device_task_runner);
 };
 
 namespace {
 // Creates a random label used to identify requests.
 std::string RandomLabel() {
   // An earlier PeerConnection spec,
   // http://dev.w3.org/2011/webrtc/editor/webrtc.html, specified the
   // MediaStream::label alphabet as containing 36 characters from
   // range: U+0021, U+0023 to U+0027, U+002A to U+002B, U+002D to U+002E,
   // U+0030 to U+0039, U+0041 to U+005A, U+005E to U+007E.
@@ skipping 1538 matching lines @@
           PostRequestToUI(*it, request);
         }
         break;
     }
   }
   label_list.clear();
   --active_enumeration_ref_count_[stream_type];
   DCHECK_GE(active_enumeration_ref_count_[stream_type], 0);
 }
 
+void MediaStreamManager::Aborted(MediaStreamType stream_type,
+                                 int capture_session_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DVLOG(1) << "Aborted({stream_type = " << stream_type <<  "} "
+           << "{capture_session_id = " << capture_session_id << "})";
+
+  for (DeviceRequests::iterator request_it = requests_.begin();
+       request_it != requests_.end(); ++request_it) {
+    DeviceRequest* request = request_it->second;
+    StreamDeviceInfoArray* devices = &(request->devices);
+
+    for (StreamDeviceInfoArray::iterator device_it = devices->begin();
+         device_it != devices->end(); ++device_it) {
+      if (device_it->device.type == stream_type &&
+          device_it->session_id == capture_session_id) {
+        StopDevice(stream_type, capture_session_id);
+        return;
+      }
+    }
+  }

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

Is not common in this file, but should we add NOTREACHED() here? I.e. an
Aborted() request on nonexistent |capture_session_id|, is it valid (tearing
down infra f.i.) or is a problem?

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

Done.

+}
+
 // static
 void MediaStreamManager::SendMessageToNativeLog(const std::string& message) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(DoAddLogMessage, message));
 }
 
 void MediaStreamManager::OnSuspend() {
   SendMessageToNativeLog("Power state suspended.");
 }
@@ skipping 303 matching lines @@
       if (it->device.type == MEDIA_DESKTOP_VIDEO_CAPTURE) {
         video_capture_manager_->SetDesktopCaptureWindowId(it->session_id,
                                                           window_id);
         break;
       }
     }
   }
 }
 
 }  // namespace content