chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.mm - Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.mm

Issue 2307083002: Cleanup: move WebRTC related files from chrome/browser/media to chrome/browser/media/webrtc/ (Closed)

Patch Set: Removed file wrongly resuscitated during rebase Created 4 years, 3 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 | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h ('k') | chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"	5 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"

6	6

7 #import <Quartz/Quartz.h>	7 #import <Quartz/Quartz.h>

8	8

9 #include "chrome/browser/media/desktop_media_list.h"	9 #include "chrome/browser/media/webrtc/desktop_media_list.h"

10	10

11 @implementation DesktopMediaPickerItem	11 @implementation DesktopMediaPickerItem

12	12

13 @synthesize titleHidden = titleHidden_;	13 @synthesize titleHidden = titleHidden_;

14	14

15 - (id)initWithSourceId:(content::DesktopMediaID)sourceID	15 - (id)initWithSourceId:(content::DesktopMediaID)sourceID

16 imageUID:(int)imageUID	16 imageUID:(int)imageUID

17 imageTitle:(NSString*)imageTitle {	17 imageTitle:(NSString*)imageTitle {

18 if ((self = [super init])) {	18 if ((self = [super init])) {

19 sourceID_ = sourceID;	19 sourceID_ = sourceID;

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52	52

53 - (NSUInteger)imageVersion {	53 - (NSUInteger)imageVersion {

54 return imageVersion_;	54 return imageVersion_;

55 }	55 }

56	56

57 - (id)imageRepresentation {	57 - (id)imageRepresentation {

58 return image_.get();	58 return image_.get();

59 }	59 }

60	60

61 @end // @interface DesktopMediaPickerItem	61 @end // @interface DesktopMediaPickerItem

OLD	NEW