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

remove unnecessary overrides

Browse source
This commit is contained in:
Cheng Zhao 2018-04-26 09:48:12 +09:00
parent 5e48dd9d45
commit cf70267871
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/native_window_mac.h
View file

@ -147,7 +147,6 @@ class NativeWindowMac : public NativeWindow,
protected: protected:
// views::WidgetDelegate: // views::WidgetDelegate:
void DeleteDelegate() override;
views::Widget* GetWidget() override; views::Widget* GetWidget() override;
const views::Widget* GetWidget() const override; const views::Widget* GetWidget() const override;
bool CanResize() const override; bool CanResize() const override;

3
atom/browser/native_window_mac.mm
View file

@ -1305,9 +1305,6 @@ gfx::Rect NativeWindowMac::WindowBoundsToContentBounds(
} }
} }
void NativeWindowMac::DeleteDelegate() {
}
views::Widget* NativeWindowMac::GetWidget() { views::Widget* NativeWindowMac::GetWidget() {
return widget_.get(); return widget_.get();
} }

4
atom/browser/ui/cocoa/atom_ns_window_delegate.mm
View file

@ -20,10 +20,10 @@
// on the fly. // on the fly.
// TODO(zcbenz): Add interface in NativeWidgetMac to allow overriding creating // TODO(zcbenz): Add interface in NativeWidgetMac to allow overriding creating
// window delegate. // window delegate.
views::BridgedNativeWidget* bridget_view = views::BridgedNativeWidget* bridged_view =
views::NativeWidgetMac::GetBridgeForNativeWindow( views::NativeWidgetMac::GetBridgeForNativeWindow(
shell->GetNativeWindow()); shell->GetNativeWindow());
if ((self = [super initWithBridgedNativeWidget:bridget_view])) { if ((self = [super initWithBridgedNativeWidget:bridged_view])) {
shell_ = shell; shell_ = shell;
is_zooming_ = false; is_zooming_ = false;
level_ = [shell_->GetNativeWindow() level]; level_ = [shell_->GetNativeWindow() level];