chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h - Issue 1880693002: Desktop Capture Picker New UI: Preliminary Refactor

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: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

Issue 1880693002: Desktop Capture Picker New UI: Preliminary Refactor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Comment Created 4 years, 8 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc ('K') | « chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc ('k') | chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

index 57286fa6f6759dd9b432accdb718f9d89d2abed2..435f5fada6c333a8e888746e16a8e05170215f02 100644

--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

@@ -5,6 +5,7 @@

#ifndef CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_

#define CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_

+#include <array>

#include <map>

#include "base/macros.h"

@@ -26,10 +27,11 @@ class DesktopCaptureChooseDesktopMediaFunctionBase

// Used for tests to supply fake picker.

class PickerFactory {

public:

- virtual std::unique_ptr<DesktopMediaList> CreateModel(bool show_screens,

- bool show_windows,

- bool show_tabs,

- bool show_audio) = 0;

+ virtual std::array<std::unique_ptr<DesktopMediaList>, 3> CreateModel(

Sergey Ulanov 2016/04/15 19:49:24 add a typedef for the result type?

qiangchen 2016/04/15 20:11:27 Done.

+ bool show_screens,

+ bool show_windows,

+ bool show_tabs,

+ bool show_audio) = 0;

virtual std::unique_ptr<DesktopMediaPicker> CreatePicker() = 0;

protected: