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

refactor: move certificate_manager_model to shell (#31631)

Browse source
This commit is contained in:
Milan Burda 2021-11-08 01:53:00 +01:00 committed by GitHub
parent 95a867b795
commit 97eb424450
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BUILD.gn
View file

@ -420,7 +420,6 @@ source_set("electron_lib") {
] ]
include_dirs = [ include_dirs = [
"chromium_src",
".", ".",
"$target_gen_dir", "$target_gen_dir",
@ -554,8 +553,9 @@ source_set("electron_lib") {
"GLIB_DISABLE_DEPRECATION_WARNINGS", "GLIB_DISABLE_DEPRECATION_WARNINGS",
] ]
sources += filenames.lib_sources_nss
sources += [ 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.cc",
"shell/browser/ui/gtk/app_indicator_icon.h", "shell/browser/ui/gtk/app_indicator_icon.h",
"shell/browser/ui/gtk/app_indicator_icon_menu.cc", "shell/browser/ui/gtk/app_indicator_icon_menu.cc",

5
filenames.gni
View file

@ -675,11 +675,6 @@ filenames = {
"shell/utility/electron_content_utility_client.h", "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 = [ lib_sources_extensions = [
"shell/browser/extensions/api/i18n/i18n_api.cc", "shell/browser/extensions/api/i18n/i18n_api.cc",
"shell/browser/extensions/api/i18n/i18n_api.h", "shell/browser/extensions/api/i18n/i18n_api.h",

2
package.json
View file

@ -78,7 +78,7 @@
"generate-version-json": "node script/generate-version-json.js", "generate-version-json": "node script/generate-version-json.js",
"lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs", "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs",
"lint:js": "node ./script/lint.js --js", "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:clang-tidy": "ts-node ./script/run-clang-tidy.ts",
"lint:cpp": "node ./script/lint.js --cc", "lint:cpp": "node ./script/lint.js --cc",
"lint:objc": "node ./script/lint.js --objc", "lint:objc": "node ./script/lint.js --objc",

2
shell/browser/api/electron_api_app.h
View file

@ -30,7 +30,7 @@
#include "shell/common/gin_helper/promise.h" #include "shell/common/gin_helper/promise.h"
#if defined(USE_NSS_CERTS) #if defined(USE_NSS_CERTS)
#include "chrome/browser/certificate_manager_model.h" #include "shell/browser/certificate_manager_model.h"
#endif #endif
namespace base { namespace base {

2
chromium_src/chrome/browser/certificate_manager_model.cc → shell/browser/certificate_manager_model.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "chrome/browser/certificate_manager_model.h" #include "shell/browser/certificate_manager_model.h"
#include <utility> #include <utility>

6
chromium_src/chrome/browser/certificate_manager_model.h → shell/browser/certificate_manager_model.h
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ #ifndef SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
#define CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ #define SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_
#include <memory> #include <memory>
#include <string> #include <string>
@ -113,4 +113,4 @@ class CertificateManagerModel {
bool is_user_db_available_; bool is_user_db_available_;
}; };
#endif // CHROME_BROWSER_CERTIFICATE_MANAGER_MODEL_H_ #endif // SHELL_BROWSER_CERTIFICATE_MANAGER_MODEL_H_