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

Merge pull request #2063 from darwin/missing-overrides

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

2
atom/browser/atom_browser_client.h
View file

@ -44,7 +44,7 @@ class AtomBrowserClient : public brightray::BrowserClient {
content::BrowserContext* browser_context, content::BrowserContext* browser_context,
content::SiteInstance* current_instance, content::SiteInstance* current_instance,
const GURL& dest_url, const GURL& dest_url,
content::SiteInstance** new_instance); content::SiteInstance** new_instance) override;
void AppendExtraCommandLineSwitches(base::CommandLine* command_line, void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
int child_process_id) override; int child_process_id) override;
void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override; void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit b158824f01a1aee3bc2e062d2834e7ff3c91c838 Subproject commit 2b09a88fc19e1270842ca7d74b6d96515041ee13