diff --git a/BUILD.gn b/BUILD.gn index ed8bcc08f214b..00225e2195234 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -420,7 +420,6 @@ source_set("electron_lib") { ] include_dirs = [ - "chromium_src", ".", "$target_gen_dir", @@ -554,8 +553,9 @@ source_set("electron_lib") { "GLIB_DISABLE_DEPRECATION_WARNINGS", ] - sources += filenames.lib_sources_nss sources += [ + "shell/browser/certificate_manager_model.cc", + "shell/browser/certificate_manager_model.h", "shell/browser/ui/gtk/app_indicator_icon.cc", "shell/browser/ui/gtk/app_indicator_icon.h", "shell/browser/ui/gtk/app_indicator_icon_menu.cc", diff --git a/filenames.gni b/filenames.gni index 0be3e39336329..060276156c2c7 100644 --- a/filenames.gni +++ b/filenames.gni @@ -675,11 +675,6 @@ filenames = { "shell/utility/electron_content_utility_client.h", ] - lib_sources_nss = [ - "chromium_src/chrome/browser/certificate_manager_model.cc", - "chromium_src/chrome/browser/certificate_manager_model.h", - ] - lib_sources_extensions = [ "shell/browser/extensions/api/i18n/i18n_api.cc", "shell/browser/extensions/api/i18n/i18n_api.h", diff --git a/package.json b/package.json index 1656c600de60d..f757a2d854887 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "generate-version-json": "node script/generate-version-json.js", "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs", "lint:js": "node ./script/lint.js --js", - "lint:clang-format": "python script/run-clang-format.py -r -c chromium_src/ shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)", + "lint:clang-format": "python script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)", "lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts", "lint:cpp": "node ./script/lint.js --cc", "lint:objc": "node ./script/lint.js --objc", diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h index 936ea0ce4f4ee..229e54b35e1e9 100644 --- a/shell/browser/api/electron_api_app.h +++ b/shell/browser/api/electron_api_app.h @@ -30,7 +30,7 @@ #include "shell/common/gin_helper/promise.h" #if defined(USE_NSS_CERTS) -#include "chrome/browser/certificate_manager_model.h" +#include "shell/browser/certificate_manager_model.h" #endif namespace base { diff --git a/chromium_src/chrome/browser/certificate_manager_model.cc b/shell/browser/certificate_manager_model.cc similarity index 99% rename from chromium_src/chrome/browser/certificate_manager_model.cc rename to shell/browser/certificate_manager_model.cc index af6bc53d6149e..e20503f20be4a 100644 --- a/chromium_src/chrome/browser/certificate_manager_model.cc +++ b/shell/browser/certificate_manager_model.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/certificate_manager_model.h" +#include "shell/browser/certificate_manager_model.h" #include diff --git a/chromium_src/chrome/browser/certificate_manager_model.h b/shell/browser/certificate_manager_model.h similarity index 96% rename from chromium_src/chrome/browser/certificate_manager_model.h rename to shell/browser/certificate_manager_model.h index 8da774e886ea0..e04670737e1ac 100644 --- a/chromium_src/chrome/browser/certificate_manager_model.h +++ b/shell/browser/certificate_manager_model.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ -#define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ +#ifndef SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ +#define SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ #include #include @@ -113,4 +113,4 @@ class CertificateManagerModel { bool is_user_db_available_; }; -#endif // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ +#endif // SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_