Browse Source

chore: use chromes auto generated definition of CHROME_VERSION_STRING (#15275)

Samuel Attard 6 years ago
parent
commit
7f73240fd5

+ 1 - 1
atom/app/atom_content_client.cc

@@ -8,13 +8,13 @@
 #include <vector>
 
 #include "atom/common/atom_version.h"
-#include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/common/chrome_version.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "content/public/common/user_agent.h"

+ 1 - 1
atom/browser/atom_browser_context.cc

@@ -21,7 +21,6 @@
 #include "atom/browser/zoom_level_delegate.h"
 #include "atom/common/application_info.h"
 #include "atom/common/atom_version.h"
-#include "atom/common/chrome_version.h"
 #include "atom/common/options_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -31,6 +30,7 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_version.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/prefs/json_pref_store.h"

+ 1 - 1
atom/common/api/atom_bindings.cc

@@ -11,7 +11,6 @@
 #include "atom/common/api/locker.h"
 #include "atom/common/application_info.h"
 #include "atom/common/atom_version.h"
-#include "atom/common/chrome_version.h"
 #include "atom/common/heap_snapshot.h"
 #include "atom/common/native_mate_converters/file_path_converter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
@@ -21,6 +20,7 @@
 #include "base/process/process_metrics_iocounters.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
+#include "chrome/common/chrome_version.h"
 #include "native_mate/dictionary.h"
 
 namespace atom {

+ 0 - 14
atom/common/chrome_version.h

@@ -1,14 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// 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 "69.0.3497.106"
-#define CHROME_VERSION "v" CHROME_VERSION_STRING
-
-#endif  // ATOM_COMMON_CHROME_VERSION_H_

+ 0 - 14
script/chrome_version.h.in

@@ -1,14 +0,0 @@
-// Copyright (c) 2014 GitHub, Inc.
-// 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 "{PLACEHOLDER}"
-#define CHROME_VERSION "v" CHROME_VERSION_STRING
-
-#endif  // ATOM_COMMON_CHROME_VERSION_H_