Minor cleanups in MediaStreamCaptureIndicator.

chrome/browser/media/media_stream_capture_indicator.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 36 matching lines @@
   void CaptureDevicesOpened(int render_process_id,
                             int render_view_id,
                             const content::MediaStreamDevices& devices,
                             const base::Closure& close_callback);
 
   // Called on IO thread when MediaStream closes the opened devices.
   void CaptureDevicesClosed(int render_process_id,
                             int render_view_id,
                             const content::MediaStreamDevices& devices);
 
   // Returns true if the render view is capturing user media (e.g., webcam

[miu, 2013/04/03 23:05:21]

s/render view/WebContents/

[Sergey Ulanov, 2013/04/03 23:43:30]

Done.

   // or microphone input).
-  bool IsCapturingUserMedia(int render_process_id, int render_view_id) const;
+  bool IsCapturingUserMedia(content::WebContents* web_contents) const;
 
   // Returns true if the render view itself is being mirrored (e.g., a source of

[miu, 2013/04/03 23:05:21]

here too: s/render view/WebContents/

[Sergey Ulanov, 2013/04/03 23:43:30]

Done.

   // media for remote broadcast).
-  bool IsBeingMirrored(int render_process_id, int render_view_id) const;
+  bool IsBeingMirrored(content::WebContents* web_contents) const;
 
  private:
   class WebContentsDeviceUsage;
 
   friend class base::RefCountedThreadSafe<MediaStreamCaptureIndicator>;
   virtual ~MediaStreamCaptureIndicator();
 
-  // Called by the public functions, executed on UI thread.
-  void DoDevicesOpenedOnUIThread(int render_process_id,
-                                 int render_view_id,
-                                 const content::MediaStreamDevices& devices,
-                                 const base::Closure& close_callback);
-  void DoDevicesClosedOnUIThread(int render_process_id,
-                                 int render_view_id,
-                                 const content::MediaStreamDevices& devices);
-
   // Following functions/variables are executed/accessed only on UI thread.
 
   // Creates and shows the status tray icon if it has not been created and is
   // supported on the current platform.
   void MaybeCreateStatusTrayIcon();
 
   // Makes sure we have done one-time initialization of the images.
   void EnsureStatusTrayIconResources();
 
   // Finds a WebContents instance by its RenderView's current or
@@ skipping 64 matching lines @@
   // updated.
   typedef std::vector<content::WebContents*> CommandTargets;
   CommandTargets command_targets_;
 
   bool should_show_balloon_;
 
   scoped_ptr<ScreenCaptureNotificationUI> screen_capture_notification_;
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_STREAM_CAPTURE_INDICATOR_H_