content/renderer/pepper/pepper_media_device_manager.h - Issue 702783002: [Merge] Pepper: Access PepperMediaDeviceManager through a WeakPtr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/pepper_media_device_manager.h

Issue 702783002: [Merge] Pepper: Access PepperMediaDeviceManager through a WeakPtr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125

Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/pepper/pepper_device_enumeration_host_helper_unittest.cc ('k') | content/renderer/pepper/pepper_media_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_media_device_manager.h

diff --git a/content/renderer/pepper/pepper_media_device_manager.h b/content/renderer/pepper/pepper_media_device_manager.h

index b3d94e07040aee2fb7ccfa8faa82a23267973ca8..c9a944085ea3c496dad2f57552a22ead768f40aa 100644

--- a/content/renderer/pepper/pepper_media_device_manager.h

+++ b/content/renderer/pepper/pepper_media_device_manager.h

@@ -23,7 +23,8 @@ class PepperMediaDeviceManager

public RenderFrameObserverTracker<PepperMediaDeviceManager>,

public base::SupportsWeakPtr<PepperMediaDeviceManager> {

public:

- static PepperMediaDeviceManager* GetForRenderFrame(RenderFrame* render_frame);

+ static base::WeakPtr<PepperMediaDeviceManager> GetForRenderFrame(

+ RenderFrame* render_frame);

virtual ~PepperMediaDeviceManager();

// PepperDeviceEnumerationHostHelper::Delegate implementation: