|
@@ -98,10 +98,14 @@ BaseWindow::BaseWindow(v8::Isolate* isolate,
|
|
|
window_->AddObserver(this);
|
|
|
|
|
|
#if defined(TOOLKIT_VIEWS)
|
|
|
- // Sets the window icon.
|
|
|
- gin::Handle<NativeImage> icon;
|
|
|
- if (options.Get(options::kIcon, &icon) && !icon.IsEmpty())
|
|
|
- SetIcon(icon);
|
|
|
+ {
|
|
|
+ v8::TryCatch try_catch(isolate);
|
|
|
+ gin::Handle<NativeImage> icon;
|
|
|
+ if (options.Get(options::kIcon, &icon) && !icon.IsEmpty())
|
|
|
+ SetIcon(icon);
|
|
|
+ if (try_catch.HasCaught())
|
|
|
+ LOG(ERROR) << "Failed to convert NativeImage";
|
|
|
+ }
|
|
|
#endif
|
|
|
}
|
|
|
|