From 676e92e322fd90ee6a53b36087d08b1a265e75ef Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Fri, 26 Apr 2013 22:49:24 -0400 Subject: [PATCH] Fix crashes when dragging links Turns out we needed to implement ContentClient::GetNativeImageNamed, which is called to get the default drag image. --- brightray/common/content_client.cc | 6 +++++- brightray/common/content_client.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/brightray/common/content_client.cc b/brightray/common/content_client.cc index e976cdb03ad..87cc07abfee 100644 --- a/brightray/common/content_client.cc +++ b/brightray/common/content_client.cc @@ -33,4 +33,8 @@ base::StringPiece ContentClient::GetDataResource(int resource_id, ui::ScaleFacto return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(resource_id, scale_factor); } -} \ No newline at end of file +gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const { + return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); +} + +} diff --git a/brightray/common/content_client.h b/brightray/common/content_client.h index b58dfe70f80..8a93771018e 100644 --- a/brightray/common/content_client.h +++ b/brightray/common/content_client.h @@ -19,6 +19,7 @@ private: virtual std::string GetProduct() const OVERRIDE; virtual std::string GetUserAgent() 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); };