Chromium Code Reviews| Index: ui/views/widget/native_widget_mac.mm |
| diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm |
| index 20db395761ee684482da88635be05860871c89e4..4b0f9f12685785f6d99f28c652ab07a565629e03 100644 |
| --- a/ui/views/widget/native_widget_mac.mm |
| +++ b/ui/views/widget/native_widget_mac.mm |
| @@ -85,13 +85,7 @@ void NativeWidgetMac::OnWindowWillClose() { |
| void NativeWidgetMac::InitNativeWidget(const Widget::InitParams& params) { |
| ownership_ = params.ownership; |
| - |
| - NSInteger style_mask = StyleMaskForParams(params); |
| - base::scoped_nsobject<NSWindow> window([[NativeWidgetMacNSWindow alloc] |
| - initWithContentRect:ui::kWindowSizeDeterminedLater |
| - styleMask:style_mask |
| - backing:NSBackingStoreBuffered |
| - defer:YES]); |
| + base::scoped_nsobject<NSWindow> window([CreateNSWindow(params) retain]); |
| [window setReleasedWhenClosed:NO]; // Owned by scoped_nsobject. |
| bridge_->Init(window, params); |
| @@ -523,6 +517,17 @@ void NativeWidgetMac::RepostNativeEvent(gfx::NativeEvent native_event) { |
| } |
| //////////////////////////////////////////////////////////////////////////////// |
| +// NativeWidgetMac, protected: |
| + |
| +NSWindow* NativeWidgetMac::CreateNSWindow(const Widget::InitParams& params) { |
| + return [[NativeWidgetMacNSWindow alloc] |
| + initWithContentRect:ui::kWindowSizeDeterminedLater |
| + styleMask:StyleMaskForParams(params) |
| + backing:NSBackingStoreBuffered |
| + defer:YES]; |
|
tapted
2015/03/18 03:51:58
autorelease
jackhou1
2015/03/18 06:14:17
Done.
|
| +} |
| + |
| +//////////////////////////////////////////////////////////////////////////////// |
| // Widget, public: |
| bool Widget::ConvertRect(const Widget* source, |