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

Merge pull request #95 from hokein/webui

Browse source 
Enable webui in content layer.
This commit is contained in:
Cheng Zhao 2015-03-29 20:57:24 +08:00
commit 17f1fc618e
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
brightray/common/content_client.cc
View file

@ -46,4 +46,9 @@ gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const {
resource_id); resource_id);
} }
base::RefCountedStaticMemory* ContentClient::GetDataResourceBytes(
int resource_id) const {
return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
}
} // namespace brightray } // namespace brightray

2
brightray/common/content_client.h
View file

@ -22,6 +22,8 @@ class ContentClient : public content::ContentClient {
base::StringPiece GetDataResource(int resource_id, base::StringPiece GetDataResource(int resource_id,
ui::ScaleFactor) const override; ui::ScaleFactor) const override;
gfx::Image& GetNativeImageNamed(int resource_id) const override; gfx::Image& GetNativeImageNamed(int resource_id) const override;
base::RefCountedStaticMemory* GetDataResourceBytes(
int resource_id) const override;
DISALLOW_COPY_AND_ASSIGN(ContentClient); DISALLOW_COPY_AND_ASSIGN(ContentClient);
}; };