bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 69.0.3497.0 (#576753)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-07-23 18:32:02 -04:00
parent fad6aec5d0
commit 7d09642925
54 changed files with 346 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libcef/common/extensions/extensions_client.cc
View File

@@ -14,16 +14,20 @@
#include "cef/grit/cef_resources.h"
//#include "cef/libcef/common/extensions/api/generated_schemas.h"
#include "cef/libcef/common/extensions/api/cef_api_features.h"
#include "cef/libcef/common/extensions/api/cef_behavior_features.h"
#include "cef/libcef/common/extensions/api/cef_manifest_features.h"
#include "cef/libcef/common/extensions/api/cef_permission_features.h"
#include "chrome/common/extensions/chrome_aliases.h"
#include "chrome/common/extensions/chrome_manifest_handlers.h"
#include "chrome/grit/common_resources.h"
#include "extensions/common/api/api_features.h"
#include "extensions/common/api/behavior_features.h"
#include "extensions/common/api/generated_schemas.h"
#include "extensions/common/api/manifest_features.h"
#include "extensions/common/api/permission_features.h"
#include "extensions/common/common_manifest_handlers.h"
#include "extensions/common/extension_urls.h"
#include "extensions/common/extensions_aliases.h"
#include "extensions/common/features/feature_provider.h"
#include "extensions/common/features/json_feature_provider_source.h"
#include "extensions/common/features/simple_feature.h"
#include "extensions/common/manifest_handler.h"
@@ -77,15 +81,19 @@ const std::string CefExtensionsClient::GetProductName() {
std::unique_ptr<FeatureProvider> CefExtensionsClient::CreateFeatureProvider(
const std::string& name) const {
std::unique_ptr<FeatureProvider> provider;
auto provider = std::make_unique<FeatureProvider>();
if (name == "api") {
provider.reset(new CefAPIFeatureProvider());
AddCoreAPIFeatures(provider.get());
AddCEFAPIFeatures(provider.get());
} else if (name == "manifest") {
provider.reset(new CefManifestFeatureProvider());
AddCoreManifestFeatures(provider.get());
AddCEFManifestFeatures(provider.get());
} else if (name == "permission") {
provider.reset(new CefPermissionFeatureProvider());
AddCorePermissionFeatures(provider.get());
AddCEFPermissionFeatures(provider.get());
} else if (name == "behavior") {
provider.reset(new CefBehaviorFeatureProvider());
// Note: There are no CEF-specific behavior features.
AddCoreBehaviorFeatures(provider.get());
} else {
NOTREACHED();
}