Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: ui/views/widget/native_widget_mac.mm

Issue 826083003: MacViews: Fix WidgetWithDestroyedNativeViewTest.Test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20150701-MacViews-grd-changes
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698