Desktop Capture Picker New UI: Preliminary Refactor

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/memory/singleton.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/media/desktop_media_list.h"
 #include "chrome/browser/media/desktop_media_picker.h"
 #include "chrome/common/extensions/api/desktop_capture.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 class DesktopCaptureChooseDesktopMediaFunctionBase
     : public ChromeAsyncExtensionFunction,
       public content::WebContentsObserver {
  public:
   // Factory creating DesktopMediaList and DesktopMediaPicker instances.
   // 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:
     virtual ~PickerFactory() {}
   };
 
   // Used to set PickerFactory used to create mock DesktopMediaPicker instances
   // for tests. Calling tests keep ownership of the factory. Can be called with
   // |factory| set to NULL at the end of the test.
   static void SetPickerFactoryForTests(PickerFactory* factory);
@@ skipping 73 matching lines @@
       std::map<RequestId, DesktopCaptureChooseDesktopMediaFunctionBase*>;
 
   RequestsMap requests_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_BASE_H_