From a8d58ea448ccac4b7d19dfd8546cdff05321072f Mon Sep 17 00:00:00 2001 From: Antonin Hildebrand Date: Fri, 26 Jun 2015 11:43:39 +0200 Subject: [PATCH] Missing overrides ninja compilation failed for me under OS X 10.11 --- atom/browser/atom_browser_client.h | 2 +- vendor/brightray | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 8cbdb3f2e199..f403a519d2f0 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -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; diff --git a/vendor/brightray b/vendor/brightray index b158824f01a1..2b09a88fc19e 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit b158824f01a1aee3bc2e062d2834e7ff3c91c838 +Subproject commit 2b09a88fc19e1270842ca7d74b6d96515041ee13