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

Fix cpplint errors in main_delegate.h

Browse source
This commit is contained in:
Adam Roben 2013-11-17 18:57:54 -05:00
parent 2c1e1b039d
commit 32f4862e56
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
brightray/common/main_delegate.h
View file

@ -5,10 +5,11 @@
#ifndef BRIGHTRAY_COMMON_MAIN_DELEGATE_H_ #ifndef BRIGHTRAY_COMMON_MAIN_DELEGATE_H_
#define BRIGHTRAY_COMMON_MAIN_DELEGATE_H_ #define BRIGHTRAY_COMMON_MAIN_DELEGATE_H_
#include <vector>
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "content/public/app/content_main_delegate.h" #include "content/public/app/content_main_delegate.h"
#include <vector>
namespace base { namespace base {
class FilePath; class FilePath;
@ -19,21 +20,23 @@ namespace brightray {
class ContentClient; class ContentClient;
class MainDelegate : public content::ContentMainDelegate { class MainDelegate : public content::ContentMainDelegate {
public: public:
MainDelegate(); MainDelegate();
~MainDelegate(); ~MainDelegate();
protected: protected:
// Subclasses can override this to provide their own ContentClient implementation. // Subclasses can override this to provide their own ContentClient
// implementation.
virtual scoped_ptr<ContentClient> CreateContentClient(); virtual scoped_ptr<ContentClient> CreateContentClient();
// Subclasses can override this to provide additional .pak files to be included in the ui::ResourceBundle. // Subclasses can override this to provide additional .pak files to be
// included in the ui::ResourceBundle.
virtual void AddPakPaths(std::vector<base::FilePath>* pak_paths) {} virtual void AddPakPaths(std::vector<base::FilePath>* pak_paths) {}
virtual bool BasicStartupComplete(int* exit_code) OVERRIDE; virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
virtual void PreSandboxStartup() OVERRIDE; virtual void PreSandboxStartup() OVERRIDE;
private: private:
void InitializeResourceBundle(); void InitializeResourceBundle();
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
static base::FilePath GetResourcesPakFilePath(); static base::FilePath GetResourcesPakFilePath();