Fix cpplint warnings.

atom/common/chrome_version.h

@@ -1,14 +1,14 @@
-// Copyright (c) 2014 GitHub, Inc. All rights reserved.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-// This file is generated by script/bootstrap.py, you should never modify it
-// by hand.
-
-#ifndef ATOM_COMMON_CHROME_VERSION_H_
-#define ATOM_COMMON_CHROME_VERSION_H_
-
-#define CHROME_VERSION_STRING "36.0.1985.125"
-#define CHROME_VERSION "v" CHROME_VERSION_STRING
-
-#endif  // ATOM_COMMON_CHROME_VERSION_H_
+// Copyright (c) 2014 GitHub, Inc. All rights reserved.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+// This file is generated by script/bootstrap.py, you should never modify it
+// by hand.
+
+#ifndef ATOM_COMMON_CHROME_VERSION_H_
+#define ATOM_COMMON_CHROME_VERSION_H_
+
+#define CHROME_VERSION_STRING "36.0.1985.125"
+#define CHROME_VERSION "v" CHROME_VERSION_STRING
+
+#endif  // ATOM_COMMON_CHROME_VERSION_H_

atom/common/native_mate_converters/accelerator_converter.cc

@@ -4,6 +4,8 @@
 
 #include "atom/common/native_mate_converters/accelerator_converter.h"
 
+#include <string>
+
 #include "atom/browser/ui/accelerator_util.h"
 
 namespace mate {