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

Merge pull request #121 from darwin/missing-overrides

Browse source 
Missing overrides
This commit is contained in:
Cheng Zhao 2015-06-26 21:30:56 +08:00
commit de57d822d7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/browser_context.h
View file

@ -31,7 +31,7 @@ class BrowserContext : public content::BrowserContext,
bool IsOffTheRecord() const override; bool IsOffTheRecord() const override;
net::URLRequestContextGetter* GetRequestContext() override; net::URLRequestContextGetter* GetRequestContext() override;
net::URLRequestContextGetter* GetRequestContextForRenderProcess( net::URLRequestContextGetter* GetRequestContextForRenderProcess(
int renderer_child_id); int renderer_child_id) override;
net::URLRequestContextGetter* GetMediaRequestContext() override; net::URLRequestContextGetter* GetMediaRequestContext() override;
net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess( net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
int renderer_child_id) override; int renderer_child_id) override;

2
brightray/common/content_client.h
View file

@ -18,7 +18,7 @@ class ContentClient : public content::ContentClient {
private: private:
std::string GetProduct() const override; std::string GetProduct() const override;
std::string GetUserAgent() const override; std::string GetUserAgent() const override;
base::string16 GetLocalizedString(int message_id) const; base::string16 GetLocalizedString(int message_id) const override;
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;