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

Side by Side Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_deprecated.h

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
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 CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_DEP RECATED_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_DEP RECATED_H_
6 #define CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_DEP RECATED_H_ 6 #define CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_DEP RECATED_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 #import <Quartz/Quartz.h> 9 #import <Quartz/Quartz.h>
10 10
11 #include <memory> 11 #include <memory>
12 12
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #import "base/mac/scoped_nsobject.h" 14 #import "base/mac/scoped_nsobject.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "chrome/browser/media/desktop_media_list.h" 16 #include "chrome/browser/media/webrtc/desktop_media_list.h"
17 #include "chrome/browser/media/desktop_media_picker.h" 17 #include "chrome/browser/media/webrtc/desktop_media_picker.h"
18 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h" 18 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h"
19 19
20 // A controller for the Desktop Media Picker. Presents the user with a list of 20 // A controller for the Desktop Media Picker. Presents the user with a list of
21 // media sources for screen-capturing, and reports the result. 21 // media sources for screen-capturing, and reports the result.
22 @interface DesktopMediaPickerControllerDeprecated 22 @interface DesktopMediaPickerControllerDeprecated
23 : NSWindowController<NSWindowDelegate, DesktopMediaPickerObserver> { 23 : NSWindowController<NSWindowDelegate, DesktopMediaPickerObserver> {
24 @private 24 @private
25 // The image browser view to present sources to the user (thumbnails and 25 // The image browser view to present sources to the user (thumbnails and
26 // names). 26 // names).
27 base::scoped_nsobject<IKImageBrowserView> sourceBrowser_; 27 base::scoped_nsobject<IKImageBrowserView> sourceBrowser_;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 tabList:(std::unique_ptr<DesktopMediaList>)tab_list 67 tabList:(std::unique_ptr<DesktopMediaList>)tab_list
68 parent:(NSWindow*)parent 68 parent:(NSWindow*)parent
69 callback:(const DesktopMediaPicker::DoneCallback&)callback 69 callback:(const DesktopMediaPicker::DoneCallback&)callback
70 appName:(const base::string16&)appName 70 appName:(const base::string16&)appName
71 targetName:(const base::string16&)targetName 71 targetName:(const base::string16&)targetName
72 requestAudio:(bool)requestAudio; 72 requestAudio:(bool)requestAudio;
73 73
74 @end 74 @end
75 75
76 #endif // CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_ DEPRECATED_H_ 76 #endif // CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_CONTROLLER_ DEPRECATED_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698