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

OVERRODE => override in atom_main_delegate.h

Browse source
This commit is contained in:
Cheng Zhao 2014-11-21 16:40:47 +08:00
parent bed09839d5
commit ac914e1f19
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
atom/app/atom_main_delegate.h
View file

@ -17,19 +17,18 @@ class AtomMainDelegate : public brightray::MainDelegate {
protected: protected:
// content::ContentMainDelegate: // content::ContentMainDelegate:
virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; bool BasicStartupComplete(int* exit_code) override;
virtual void PreSandboxStartup() OVERRIDE; void PreSandboxStartup() override;
virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE; content::ContentBrowserClient* CreateContentBrowserClient() override;
virtual content::ContentRendererClient* content::ContentRendererClient* CreateContentRendererClient() override;
CreateContentRendererClient() OVERRIDE;
// brightray::MainDelegate: // brightray::MainDelegate:
virtual scoped_ptr<brightray::ContentClient> CreateContentClient() OVERRIDE; scoped_ptr<brightray::ContentClient> CreateContentClient() override;
virtual void AddDataPackFromPath( void AddDataPackFromPath(
ui::ResourceBundle* bundle, const base::FilePath& pak_dir) OVERRIDE; ui::ResourceBundle* bundle, const base::FilePath& pak_dir) override;
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
virtual void OverrideChildProcessPath() OVERRIDE; void OverrideChildProcessPath() override;
virtual void OverrideFrameworkBundlePath() OVERRIDE; void OverrideFrameworkBundlePath() override;
#endif #endif
private: private: