mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: NativeWindow::Create() returns a unique_ptr (#43605)

Browse source 
refactor: NativeWindow::Create() returns a unique_ptr

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
trop[bot] 2024-09-06 14:19:50 -05:00 committed by GitHub
parent 9da190f786
commit 5c424edcca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_base_window.cc
View file

@ -96,8 +96,8 @@ BaseWindow::BaseWindow(v8::Isolate* isolate,
} }
// Creates NativeWindow. // Creates NativeWindow.
window_.reset(NativeWindow::Create( window_ = NativeWindow::Create(
options, parent.IsEmpty() ? nullptr : parent->window_.get())); options, parent.IsEmpty() ? nullptr : parent->window_.get());
window_->AddObserver(this); window_->AddObserver(this);
SetContentView(View::Create(isolate)); SetContentView(View::Create(isolate));

3
shell/browser/native_window.h
View file

@ -72,7 +72,8 @@ class NativeWindow : public base::SupportsUserData,
// Create window with existing WebContents, the caller is responsible for // Create window with existing WebContents, the caller is responsible for
// managing the window's live. // managing the window's live.
static NativeWindow* Create(const gin_helper::Dictionary& options, static std::unique_ptr<NativeWindow> Create(
const gin_helper::Dictionary& options,
NativeWindow* parent = nullptr); NativeWindow* parent = nullptr);
void InitFromOptions(const gin_helper::Dictionary& options); void InitFromOptions(const gin_helper::Dictionary& options);

5
shell/browser/native_window_mac.mm
View file

@ -1805,9 +1805,10 @@ std::optional<gfx::Rect> NativeWindowMac::GetWindowControlsOverlayRect() {
} }
// static // static
NativeWindow* NativeWindow::Create(const gin_helper::Dictionary& options, std::unique_ptr<NativeWindow> NativeWindow::Create(
const gin_helper::Dictionary& options,
NativeWindow* parent) { NativeWindow* parent) {
return new NativeWindowMac(options, parent); return std::make_unique<NativeWindowMac>(options, parent);
} }
} // namespace electron } // namespace electron

5
shell/browser/native_window_views.cc
View file

@ -1787,9 +1787,10 @@ void NativeWindowViews::MoveBehindTaskBarIfNeeded() {
} }
// static // static
NativeWindow* NativeWindow::Create(const gin_helper::Dictionary& options, std::unique_ptr<NativeWindow> NativeWindow::Create(
const gin_helper::Dictionary& options,
NativeWindow* parent) { NativeWindow* parent) {
return new NativeWindowViews(options, parent); return std::make_unique<NativeWindowViews>(options, parent);
} }
} // namespace electron } // namespace electron