github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-03 03:35:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 572d4c5687 a8d58ea448
commit a79fcac047
2 changed files with 2 additions and 2 deletions
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::SiteInstance* current_instance,
const GURL& dest_url,
content::SiteInstance** new_instance);
content::SiteInstance** new_instance) override;
void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
int child_process_id) override;
void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;

2
vendor/brightray vendored

Submodule vendor/brightray updated: b158824f01...2b09a88fc1