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

Fix API changes of Chrome 53

Browse source
This commit is contained in:
Cheng Zhao 2016-09-06 17:22:52 +09:00
parent bff2d41e73
commit ab14221a85
13 changed files with 46 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/common/content_client.cc
View file

@ -54,8 +54,8 @@ gfx::Image& ContentClient::GetNativeImageNamed(int resource_id) const {
resource_id);
}
base::RefCountedStaticMemory* ContentClient::GetDataResourceBytes(
int resource_id) const {
base::RefCountedMemory* ContentClient::GetDataResourceBytes(
int resource_id) const {
return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
}

3
brightray/common/content_client.h
View file

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

3
brightray/common/switches.cc
View file

@ -49,6 +49,9 @@ const char kAuthServerWhitelist[] = "auth-server-whitelist";
// Whitelist containing servers for which Kerberos delegation is allowed.
const char kAuthNegotiateDelegateWhitelist[] = "auth-negotiate-delegate-whitelist";
// Ignores certificate-related errors.
const char kIgnoreCertificateErrors[] = "ignore-certificate-errors";
} // namespace switches
} // namespace brightray

1
brightray/common/switches.h
View file

@ -17,6 +17,7 @@ extern const char kProxyPacUrl[];
extern const char kDisableHttp2[];
extern const char kAuthServerWhitelist[];
extern const char kAuthNegotiateDelegateWhitelist[];
extern const char kIgnoreCertificateErrors[];
} // namespace switches