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

Fix crashes when dragging links

Browse source 
Turns out we needed to implement ContentClient::GetNativeImageNamed, which is
called to get the default drag image.
This commit is contained in:
Adam Roben 2013-04-26 22:49:24 -04:00
parent 73d467d657
commit 676e92e322
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
brightray/common/content_client.cc
View file

@ -33,4 +33,8 @@ base::StringPiece ContentClient::GetDataResource(int resource_id, ui::ScaleFacto
return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(resource_id, scale_factor); return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(resource_id, scale_factor);
} }
} gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const {
return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
}
}

1
brightray/common/content_client.h
View file

@ -19,6 +19,7 @@ private:
virtual std::string GetProduct() const OVERRIDE; virtual std::string GetProduct() const OVERRIDE;
virtual std::string GetUserAgent() const OVERRIDE; virtual std::string GetUserAgent() const OVERRIDE;
virtual base::StringPiece GetDataResource(int resource_id, ui::ScaleFactor) const OVERRIDE; virtual base::StringPiece GetDataResource(int resource_id, ui::ScaleFactor) const OVERRIDE;
virtual gfx::Image& GetNativeImageNamed(int resource_id) const OVERRIDE;
DISALLOW_COPY_AND_ASSIGN(ContentClient); DISALLOW_COPY_AND_ASSIGN(ContentClient);
}; };