mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 108.0.5359.0 (#1058933)
This commit is contained in:
@@ -52,6 +52,7 @@
|
||||
#include "components/prefs/pref_filter.h"
|
||||
#include "components/prefs/pref_registry_simple.h"
|
||||
#include "components/prefs/pref_service.h"
|
||||
#include "components/privacy_sandbox/privacy_sandbox_prefs.h"
|
||||
#include "components/proxy_config/pref_proxy_config_tracker_impl.h"
|
||||
#include "components/proxy_config/proxy_config_dictionary.h"
|
||||
#include "components/safe_browsing/core/common/safe_browsing_prefs.h"
|
||||
@@ -272,6 +273,7 @@ std::unique_ptr<PrefService> CreatePrefService(Profile* profile,
|
||||
PermissionBubbleMediaAccessHandler::RegisterProfilePrefs(registry.get());
|
||||
permissions::PermissionActionsHistory::RegisterProfilePrefs(registry.get());
|
||||
prefetch::RegisterPredictionOptionsProfilePrefs(registry.get());
|
||||
privacy_sandbox::RegisterProfilePrefs(registry.get());
|
||||
ProfileNetworkContextService::RegisterProfilePrefs(registry.get());
|
||||
safe_browsing::RegisterProfilePrefs(registry.get());
|
||||
RegisterProfilePrefs(registry.get());
|
||||
|
@@ -19,7 +19,7 @@ CefPrefStore::CefPrefStore()
|
||||
init_complete_(false),
|
||||
committed_(true) {}
|
||||
|
||||
bool CefPrefStore::GetValue(const std::string& key,
|
||||
bool CefPrefStore::GetValue(base::StringPiece key,
|
||||
const base::Value** value) const {
|
||||
return prefs_.GetValue(key, value);
|
||||
}
|
||||
@@ -50,18 +50,18 @@ bool CefPrefStore::IsInitializationComplete() const {
|
||||
}
|
||||
|
||||
void CefPrefStore::SetValue(const std::string& key,
|
||||
std::unique_ptr<base::Value> value,
|
||||
base::Value value,
|
||||
uint32_t flags) {
|
||||
if (prefs_.SetValue(key, base::Value::FromUniquePtrValue(std::move(value)))) {
|
||||
if (prefs_.SetValue(key, std::move(value))) {
|
||||
committed_ = false;
|
||||
NotifyPrefValueChanged(key);
|
||||
}
|
||||
}
|
||||
|
||||
void CefPrefStore::SetValueSilently(const std::string& key,
|
||||
std::unique_ptr<base::Value> value,
|
||||
base::Value value,
|
||||
uint32_t flags) {
|
||||
if (prefs_.SetValue(key, base::Value::FromUniquePtrValue(std::move(value))))
|
||||
if (prefs_.SetValue(key, std::move(value)))
|
||||
committed_ = false;
|
||||
}
|
||||
|
||||
@@ -139,15 +139,15 @@ void CefPrefStore::ReportValueChanged(const std::string& key, uint32_t flags) {
|
||||
}
|
||||
|
||||
void CefPrefStore::SetString(const std::string& key, const std::string& value) {
|
||||
SetValue(key, std::make_unique<base::Value>(value), DEFAULT_PREF_WRITE_FLAGS);
|
||||
SetValue(key, base::Value(value), DEFAULT_PREF_WRITE_FLAGS);
|
||||
}
|
||||
|
||||
void CefPrefStore::SetInteger(const std::string& key, int value) {
|
||||
SetValue(key, std::make_unique<base::Value>(value), DEFAULT_PREF_WRITE_FLAGS);
|
||||
SetValue(key, base::Value(value), DEFAULT_PREF_WRITE_FLAGS);
|
||||
}
|
||||
|
||||
void CefPrefStore::SetBoolean(const std::string& key, bool value) {
|
||||
SetValue(key, std::make_unique<base::Value>(value), DEFAULT_PREF_WRITE_FLAGS);
|
||||
SetValue(key, base::Value(value), DEFAULT_PREF_WRITE_FLAGS);
|
||||
}
|
||||
|
||||
bool CefPrefStore::GetString(const std::string& key, std::string* value) const {
|
||||
|
@@ -24,7 +24,7 @@ class CefPrefStore : public PersistentPrefStore {
|
||||
CefPrefStore& operator=(const CefPrefStore&) = delete;
|
||||
|
||||
// Overriden from PrefStore.
|
||||
bool GetValue(const std::string& key,
|
||||
bool GetValue(base::StringPiece key,
|
||||
const base::Value** result) const override;
|
||||
base::Value::Dict GetValues() const override;
|
||||
void AddObserver(PrefStore::Observer* observer) override;
|
||||
@@ -36,10 +36,10 @@ class CefPrefStore : public PersistentPrefStore {
|
||||
bool GetMutableValue(const std::string& key, base::Value** result) override;
|
||||
void ReportValueChanged(const std::string& key, uint32_t flags) override;
|
||||
void SetValue(const std::string& key,
|
||||
std::unique_ptr<base::Value> value,
|
||||
base::Value value,
|
||||
uint32_t flags) override;
|
||||
void SetValueSilently(const std::string& key,
|
||||
std::unique_ptr<base::Value> value,
|
||||
base::Value value,
|
||||
uint32_t flags) override;
|
||||
void RemoveValuesByPrefixSilently(const std::string& prefix) override;
|
||||
void RemoveValue(const std::string& key, uint32_t flags) override;
|
||||
|
@@ -172,12 +172,12 @@ void SetExtensionPrefs(content::WebContents* web_contents,
|
||||
void SetString(CommandLinePrefStore* prefs,
|
||||
const std::string& key,
|
||||
const std::string& value) {
|
||||
prefs->SetValue(key, base::WrapUnique(new base::Value(value)),
|
||||
prefs->SetValue(key, base::Value(value),
|
||||
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
|
||||
}
|
||||
|
||||
void SetBool(CommandLinePrefStore* prefs, const std::string& key, bool value) {
|
||||
prefs->SetValue(key, base::WrapUnique(new base::Value(value)),
|
||||
prefs->SetValue(key, base::Value(value),
|
||||
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user