chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm - Issue 2560333002: Remove Deprecate Code For Desktop Capture Picker Old UI

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_controller.mm

Issue 2560333002: Remove Deprecate Code For Desktop Capture Picker Old UI (Closed)

Patch Set: Further remove CombinedDesktopMediaList Created 4 years 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

« chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm ('K') | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm ('k') | chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h » ('j') | chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc » ('J')
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_controller.h"	5 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #import "base/mac/bundle_locations.h"	11 #import "base/mac/bundle_locations.h"

12 #include "base/strings/sys_string_conversions.h"	12 #include "base/strings/sys_string_conversions.h"

13 #include "chrome/browser/media/combined_desktop_media_list.h"	13 #include "chrome/browser/media/webrtc/desktop_media_list.h"

14 #include "chrome/browser/ui/browser_finder.h"	14 #include "chrome/browser/ui/browser_finder.h"

15 #include "chrome/browser/ui/browser_window.h"	15 #include "chrome/browser/ui/browser_window.h"

16 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"	16 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"

17 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"	17 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"

18 #include "chrome/common/chrome_switches.h"	18 #include "chrome/common/chrome_switches.h"

19 #include "chrome/grit/chromium_strings.h"	19 #include "chrome/grit/chromium_strings.h"

20 #include "chrome/grit/generated_resources.h"	20 #include "chrome/grit/generated_resources.h"

21 #include "components/strings/grit/components_strings.h"	21 #include "components/strings/grit/components_strings.h"

22 #include "content/public/browser/browser_thread.h"	22 #include "content/public/browser/browser_thread.h"

23 #include "content/public/browser/render_frame_host.h"	23 #include "content/public/browser/render_frame_host.h"

(...skipping 760 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
784	784

785 DesktopMediaPickerItem* item = [items objectAtIndex:index];	785 DesktopMediaPickerItem* item = [items objectAtIndex:index];

786 [item setImageRepresentation:image];	786 [item setImageRepresentation:image];

787 [browser reloadData];	787 [browser reloadData];

788	788

789 if (sourceType == DesktopMediaID::TYPE_WEB_CONTENTS)	789 if (sourceType == DesktopMediaID::TYPE_WEB_CONTENTS)

790 [self setTabBrowserIndex:selectedIndex];	790 [self setTabBrowserIndex:selectedIndex];

791 }	791 }

792	792

793 @end // @interface DesktopMediaPickerController	793 @end // @interface DesktopMediaPickerController

OLD	NEW