| 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 c0951c8a8b20835d7206dab912ac828bea9080f0..859da3a54f8ac6e10eb4e2d8e70c3ed8ac042832 100644
|
| --- a/ui/views/widget/native_widget_mac.mm
|
| +++ b/ui/views/widget/native_widget_mac.mm
|
| @@ -195,11 +195,15 @@ void NativeWidgetMac::ViewRemoved(View* view) {
|
| }
|
|
|
| void NativeWidgetMac::SetNativeWindowProperty(const char* name, void* value) {
|
| - bridge_->SetNativeWindowProperty(name, value);
|
| + if (bridge_)
|
| + bridge_->SetNativeWindowProperty(name, value);
|
| }
|
|
|
| void* NativeWidgetMac::GetNativeWindowProperty(const char* name) const {
|
| - return bridge_->GetNativeWindowProperty(name);
|
| + if (bridge_)
|
| + return bridge_->GetNativeWindowProperty(name);
|
| +
|
| + return nullptr;
|
| }
|
|
|
| TooltipManager* NativeWidgetMac::GetTooltipManager() const {
|
|
|