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

Side by Side Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

Issue 1758463002: Add browser test cases for tab and audio share, which are new functionality of desktop share. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve comment Created 4 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_
6 #define CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_ 6 #define CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "chrome/browser/extensions/chrome_extension_function.h" 12 #include "chrome/browser/extensions/chrome_extension_function.h"
13 #include "chrome/browser/media/desktop_media_list.h" 13 #include "chrome/browser/media/desktop_media_list.h"
14 #include "chrome/browser/media/desktop_media_picker.h" 14 #include "chrome/browser/media/desktop_media_picker.h"
15 #include "chrome/common/extensions/api/desktop_capture.h" 15 #include "chrome/common/extensions/api/desktop_capture.h"
16 #include "content/public/browser/web_contents_observer.h" 16 #include "content/public/browser/web_contents_observer.h"
17 #include "url/gurl.h" 17 #include "url/gurl.h"
18 18
19 namespace extensions { 19 namespace extensions {
20 20
21 class DesktopCaptureChooseDesktopMediaFunctionBase 21 class DesktopCaptureChooseDesktopMediaFunctionBase
22 : public ChromeAsyncExtensionFunction, 22 : public ChromeAsyncExtensionFunction,
23 public content::WebContentsObserver { 23 public content::WebContentsObserver {
24 public: 24 public:
25 // Factory creating DesktopMediaList and DesktopMediaPicker instances. 25 // Factory creating DesktopMediaList and DesktopMediaPicker instances.
26 // Used for tests to supply fake picker. 26 // Used for tests to supply fake picker.
27 class PickerFactory { 27 class PickerFactory {
28 public: 28 public:
29 virtual scoped_ptr<DesktopMediaList> CreateModel(bool show_screens, 29 virtual scoped_ptr<DesktopMediaList> CreateModel(bool show_screens,
30 bool show_windows) = 0; 30 bool show_windows,
31 bool show_tabs,
32 bool show_audio) = 0;
31 virtual scoped_ptr<DesktopMediaPicker> CreatePicker() = 0; 33 virtual scoped_ptr<DesktopMediaPicker> CreatePicker() = 0;
32 protected: 34 protected:
33 virtual ~PickerFactory() {} 35 virtual ~PickerFactory() {}
34 }; 36 };
35 37
36 // Used to set PickerFactory used to create mock DesktopMediaPicker instances 38 // Used to set PickerFactory used to create mock DesktopMediaPicker instances
37 // for tests. Calling tests keep ownership of the factory. Can be called with 39 // for tests. Calling tests keep ownership of the factory. Can be called with
38 // |factory| set to NULL at the end of the test. 40 // |factory| set to NULL at the end of the test.
39 static void SetPickerFactoryForTests(PickerFactory* factory); 41 static void SetPickerFactoryForTests(PickerFactory* factory);
40 42
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 std::map<RequestId, DesktopCaptureChooseDesktopMediaFunctionBase*>; 115 std::map<RequestId, DesktopCaptureChooseDesktopMediaFunctionBase*>;
114 116
115 RequestsMap requests_; 117 RequestsMap requests_;
116 118
117 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry); 119 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry);
118 }; 120 };
119 121
120 } // namespace extensions 122 } // namespace extensions
121 123
122 #endif // CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_ 124 #endif // CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698