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

Make cpplint pass headers test without setting "NOLINT".

Browse source
This commit is contained in:
Cheng Zhao 2013-11-05 10:00:11 +08:00
parent 8112fe741e
commit 8bb3b53833
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/atom_main.cc
View file

@ -4,26 +4,31 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if defined(OS_WIN)
#include <stdio.h> #include <stdio.h>
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#include "content/public/app/content_main.h" #include <windows.h>
#include <shellapi.h>
namespace node {
int Start(int argc, char *argv[]);
}
#if defined(OS_WIN)
#include <windows.h> // NOLINT
#include <shellapi.h> // NOLINT
#include "app/atom_main_delegate.h" #include "app/atom_main_delegate.h"
#include "base/environment.h" #include "base/environment.h"
#include "content/public/app/startup_helper_win.h" #include "content/public/app/startup_helper_win.h"
#include "sandbox/win/src/sandbox_types.h" #include "sandbox/win/src/sandbox_types.h"
#else // defined(OS_WIN)
#include "app/atom_library_main.h"
#endif // defined(OS_MACOSX) || defined(OS_LINUX)
#include "content/public/app/content_main.h"
// Declaration of node::Start.
namespace node {
int Start(int argc, char *argv[]);
}
#if defined(OS_WIN)
int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) { int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
int argc = 0; int argc = 0;
@ -86,8 +91,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
#else // defined(OS_WIN) #else // defined(OS_WIN)
#include "app/atom_library_main.h"
int main(int argc, const char* argv[]) { int main(int argc, const char* argv[]) {
char* node_indicator = getenv("ATOM_SHELL_INTERNAL_RUN_AS_NODE"); char* node_indicator = getenv("ATOM_SHELL_INTERNAL_RUN_AS_NODE");
if (node_indicator != NULL && strcmp(node_indicator, "1") == 0) if (node_indicator != NULL && strcmp(node_indicator, "1") == 0)
@ -96,4 +99,4 @@ int main(int argc, const char* argv[]) {
return AtomMain(argc, argv); return AtomMain(argc, argv);
} }
#endif #endif // defined(OS_MACOSX) || defined(OS_LINUX)