mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Remove DISALLOW_ macro from libcef/ (see issue #3234)
Also perform related C++ cleanup: - Use =default instead of {} for default implementations of constructors/destructors. - Replace typedef with using.
This commit is contained in:
@@ -17,6 +17,9 @@ class AlloyBrowserHostImpl;
|
||||
|
||||
class CefFileDialogRunner {
|
||||
public:
|
||||
CefFileDialogRunner(const CefFileDialogRunner&) = delete;
|
||||
CefFileDialogRunner& operator=(const CefFileDialogRunner&) = delete;
|
||||
|
||||
// Extend blink::mojom::FileChooserParams with some options unique to CEF.
|
||||
struct FileChooserParams : public blink::mojom::FileChooserParams {
|
||||
// 0-based index of the selected value in |accept_types|.
|
||||
@@ -30,8 +33,8 @@ class CefFileDialogRunner {
|
||||
};
|
||||
|
||||
// The argument vector will be empty if the dialog was canceled.
|
||||
typedef base::OnceCallback<void(int, const std::vector<base::FilePath>&)>
|
||||
RunFileChooserCallback;
|
||||
using RunFileChooserCallback =
|
||||
base::OnceCallback<void(int, const std::vector<base::FilePath>&)>;
|
||||
|
||||
// Display the file chooser dialog. Execute |callback| on completion.
|
||||
virtual void Run(AlloyBrowserHostImpl* browser,
|
||||
@@ -42,11 +45,8 @@ class CefFileDialogRunner {
|
||||
// Allow deletion via std::unique_ptr only.
|
||||
friend std::default_delete<CefFileDialogRunner>;
|
||||
|
||||
CefFileDialogRunner() {}
|
||||
virtual ~CefFileDialogRunner() {}
|
||||
|
||||
private:
|
||||
DISALLOW_COPY_AND_ASSIGN(CefFileDialogRunner);
|
||||
CefFileDialogRunner() = default;
|
||||
virtual ~CefFileDialogRunner() = default;
|
||||
};
|
||||
|
||||
#endif // CEF_LIBCEF_BROWSER_FILE_DIALOG_RUNNER_H_
|
||||
|
Reference in New Issue
Block a user