From c6bcf49accdc4f25991dcd7444af2593b51f0e4e Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Fri, 26 Jul 2019 16:18:13 -0700 Subject: [PATCH] chore: clean up BrowserView/TopLevelWindow New impl (#19375) * chore: clean up BrowserView::New impl * also default TL win options dict --- shell/browser/api/atom_api_browser_view.cc | 11 ++--------- shell/browser/api/atom_api_top_level_window.cc | 6 +++--- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/shell/browser/api/atom_api_browser_view.cc b/shell/browser/api/atom_api_browser_view.cc index c9c9cba9b85..618c2ecb06e 100644 --- a/shell/browser/api/atom_api_browser_view.cc +++ b/shell/browser/api/atom_api_browser_view.cc @@ -102,15 +102,8 @@ mate::WrappableBase* BrowserView::New(mate::Arguments* args) { return nullptr; } - if (args->Length() > 1) { - args->ThrowError("Too many arguments"); - return nullptr; - } - - mate::Dictionary options; - if (!(args->Length() == 1 && args->GetNext(&options))) { - options = mate::Dictionary::CreateEmpty(args->isolate()); - } + mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate()); + args->GetNext(&options); return new BrowserView(args->isolate(), args->GetThis(), options); } diff --git a/shell/browser/api/atom_api_top_level_window.cc b/shell/browser/api/atom_api_top_level_window.cc index acfb13df9b3..c3f82dfc4d0 100644 --- a/shell/browser/api/atom_api_top_level_window.cc +++ b/shell/browser/api/atom_api_top_level_window.cc @@ -1030,9 +1030,9 @@ void TopLevelWindow::RemoveFromParentChildWindows() { // static mate::WrappableBase* TopLevelWindow::New(mate::Arguments* args) { - mate::Dictionary options; - if (!(args->Length() == 1 && args->GetNext(&options))) - options = mate::Dictionary::CreateEmpty(args->isolate()); + mate::Dictionary options = mate::Dictionary::CreateEmpty(args->isolate()); + args->GetNext(&options); + return new TopLevelWindow(args->isolate(), args->GetThis(), options); }