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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 865683004: media: Make |web_encrypted_media_client_| a scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/gtest_prod_util.h" 12 #include "base/gtest_prod_util.h"
13 #include "base/id_map.h" 13 #include "base/id_map.h"
14 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
15 #include "base/observer_list.h" 16 #include "base/observer_list.h"
16 #include "base/process/process_handle.h" 17 #include "base/process/process_handle.h"
17 #include "content/common/accessibility_mode_enums.h" 18 #include "content/common/accessibility_mode_enums.h"
18 #include "content/common/frame_message_enums.h" 19 #include "content/common/frame_message_enums.h"
19 #include "content/common/mojo/service_registry_impl.h" 20 #include "content/common/mojo/service_registry_impl.h"
20 #include "content/public/common/javascript_message_type.h" 21 #include "content/public/common/javascript_message_type.h"
21 #include "content/public/common/referrer.h" 22 #include "content/public/common/referrer.h"
22 #include "content/public/renderer/render_frame.h" 23 #include "content/public/renderer/render_frame.h"
23 #include "content/renderer/render_frame_proxy.h" 24 #include "content/renderer/render_frame_proxy.h"
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 // along with the RenderFrame automatically. This is why we just store weak 792 // along with the RenderFrame automatically. This is why we just store weak
792 // references. 793 // references.
793 794
794 // Dispatches permission requests for Web Notifications. 795 // Dispatches permission requests for Web Notifications.
795 NotificationPermissionDispatcher* notification_permission_dispatcher_; 796 NotificationPermissionDispatcher* notification_permission_dispatcher_;
796 797
797 // Destroyed via the RenderFrameObserver::OnDestruct() mechanism. 798 // Destroyed via the RenderFrameObserver::OnDestruct() mechanism.
798 UserMediaClientImpl* web_user_media_client_; 799 UserMediaClientImpl* web_user_media_client_;
799 800
800 // EncryptedMediaClient attached to this frame; lazily initialized. 801 // EncryptedMediaClient attached to this frame; lazily initialized.
801 media::WebEncryptedMediaClientImpl* web_encrypted_media_client_; 802 scoped_ptr<media::WebEncryptedMediaClientImpl> web_encrypted_media_client_;
802 803
803 // MidiClient attached to this frame; lazily initialized. 804 // MidiClient attached to this frame; lazily initialized.
804 MidiDispatcher* midi_dispatcher_; 805 MidiDispatcher* midi_dispatcher_;
805 806
806 #if defined(OS_ANDROID) 807 #if defined(OS_ANDROID)
807 // Manages all media players in this render frame for communicating with the 808 // Manages all media players in this render frame for communicating with the
808 // real media player in the browser process. It's okay to use a raw pointer 809 // real media player in the browser process. It's okay to use a raw pointer
809 // since it's a RenderFrameObserver. 810 // since it's a RenderFrameObserver.
810 RendererMediaPlayerManager* media_player_manager_; 811 RendererMediaPlayerManager* media_player_manager_;
811 #endif 812 #endif
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 #endif 853 #endif
853 854
854 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 855 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
855 856
856 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 857 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
857 }; 858 };
858 859
859 } // namespace content 860 } // namespace content
860 861
861 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 862 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698