Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #2063 from darwin/missing-overrides

Missing overrides
Cheng Zhao 9 years ago
parent
572d4c5687 a8d58ea448
commit
a79fcac047
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      atom/browser/atom_browser_client.h
  2. 1 1
      vendor/brightray

+ 1 - 1
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;

+ 1 - 1
vendor/brightray
View File 

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