Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(869)

Side by Side Diff: content/browser/renderer_host/media/media_stream_dispatcher_host.h

Issue 616603004: Replacing the OVERRIDE with override and FINAL with final in content/browser/renderer_host (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 20 matching lines...) Expand all
31 int render_process_id, 31 int render_process_id,
32 const ResourceContext::SaltCallback& salt_callback, 32 const ResourceContext::SaltCallback& salt_callback,
33 MediaStreamManager* media_stream_manager); 33 MediaStreamManager* media_stream_manager);
34 34
35 // MediaStreamRequester implementation. 35 // MediaStreamRequester implementation.
36 virtual void StreamGenerated( 36 virtual void StreamGenerated(
37 int render_frame_id, 37 int render_frame_id,
38 int page_request_id, 38 int page_request_id,
39 const std::string& label, 39 const std::string& label,
40 const StreamDeviceInfoArray& audio_devices, 40 const StreamDeviceInfoArray& audio_devices,
41 const StreamDeviceInfoArray& video_devices) OVERRIDE; 41 const StreamDeviceInfoArray& video_devices) override;
42 virtual void StreamGenerationFailed( 42 virtual void StreamGenerationFailed(
43 int render_frame_id, 43 int render_frame_id,
44 int page_request_id, 44 int page_request_id,
45 content::MediaStreamRequestResult result) OVERRIDE; 45 content::MediaStreamRequestResult result) override;
46 virtual void DeviceStopped(int render_frame_id, 46 virtual void DeviceStopped(int render_frame_id,
47 const std::string& label, 47 const std::string& label,
48 const StreamDeviceInfo& device) OVERRIDE; 48 const StreamDeviceInfo& device) override;
49 virtual void DevicesEnumerated(int render_frame_id, 49 virtual void DevicesEnumerated(int render_frame_id,
50 int page_request_id, 50 int page_request_id,
51 const std::string& label, 51 const std::string& label,
52 const StreamDeviceInfoArray& devices) OVERRIDE; 52 const StreamDeviceInfoArray& devices) override;
53 virtual void DeviceOpened(int render_frame_id, 53 virtual void DeviceOpened(int render_frame_id,
54 int page_request_id, 54 int page_request_id,
55 const std::string& label, 55 const std::string& label,
56 const StreamDeviceInfo& video_device) OVERRIDE; 56 const StreamDeviceInfo& video_device) override;
57 57
58 // BrowserMessageFilter implementation. 58 // BrowserMessageFilter implementation.
59 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 59 virtual bool OnMessageReceived(const IPC::Message& message) override;
60 virtual void OnChannelClosing() OVERRIDE; 60 virtual void OnChannelClosing() override;
61 61
62 protected: 62 protected:
63 virtual ~MediaStreamDispatcherHost(); 63 virtual ~MediaStreamDispatcherHost();
64 64
65 private: 65 private:
66 friend class MockMediaStreamDispatcherHost; 66 friend class MockMediaStreamDispatcherHost;
67 67
68 void OnGenerateStream(int render_frame_id, 68 void OnGenerateStream(int render_frame_id,
69 int page_request_id, 69 int page_request_id,
70 const StreamOptions& components, 70 const StreamOptions& components,
(...skipping 30 matching lines...) Expand all
101 int render_process_id_; 101 int render_process_id_;
102 ResourceContext::SaltCallback salt_callback_; 102 ResourceContext::SaltCallback salt_callback_;
103 MediaStreamManager* media_stream_manager_; 103 MediaStreamManager* media_stream_manager_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost); 105 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost);
106 }; 106 };
107 107
108 } // namespace content 108 } // namespace content
109 109
110 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_ 110 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_DISPATCHER_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698