chore: bump chromium to 108.0.5329.0 (main) (#35628)
Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
parent
94955a7999
commit
16f459228b
178 changed files with 1000 additions and 936 deletions
|
@ -59,6 +59,7 @@ class DesktopCapturer : public gin::Wrappable<DesktopCapturer>,
|
|||
void OnSourceThumbnailChanged(int index) override {}
|
||||
void OnSourcePreviewChanged(size_t index) override {}
|
||||
void OnDelegatedSourceListSelection() override {}
|
||||
void OnDelegatedSourceListDismissed() override {}
|
||||
|
||||
private:
|
||||
void UpdateSourcesList(DesktopMediaList* list);
|
||||
|
|
|
@ -294,14 +294,14 @@ v8::Local<v8::Value> SystemPreferences::GetUserDefault(
|
|||
}
|
||||
|
||||
void SystemPreferences::RegisterDefaults(gin::Arguments* args) {
|
||||
base::Value::Dict value;
|
||||
base::Value::Dict dict_value;
|
||||
|
||||
if (!args->GetNext(&value)) {
|
||||
if (!args->GetNext(&dict_value)) {
|
||||
args->ThrowError();
|
||||
return;
|
||||
}
|
||||
@try {
|
||||
NSDictionary* dict = DictionaryValueToNSDictionary(std::move(value));
|
||||
NSDictionary* dict = DictionaryValueToNSDictionary(std::move(dict_value));
|
||||
for (id key in dict) {
|
||||
id value = [dict objectForKey:key];
|
||||
if ([value isKindOfClass:[NSNull class]] || value == nil) {
|
||||
|
|
|
@ -598,18 +598,13 @@ PrefService* GetPrefService(content::WebContents* web_contents) {
|
|||
std::map<std::string, std::string> GetAddedFileSystemPaths(
|
||||
content::WebContents* web_contents) {
|
||||
auto* pref_service = GetPrefService(web_contents);
|
||||
const base::Value* file_system_paths_value =
|
||||
pref_service->GetDictionary(prefs::kDevToolsFileSystemPaths);
|
||||
const base::Value::Dict& file_system_paths =
|
||||
pref_service->GetDict(prefs::kDevToolsFileSystemPaths);
|
||||
std::map<std::string, std::string> result;
|
||||
if (file_system_paths_value) {
|
||||
const base::DictionaryValue* file_system_paths_dict;
|
||||
file_system_paths_value->GetAsDictionary(&file_system_paths_dict);
|
||||
|
||||
for (auto it : file_system_paths_dict->DictItems()) {
|
||||
std::string type =
|
||||
it.second.is_string() ? it.second.GetString() : std::string();
|
||||
result[it.first] = type;
|
||||
}
|
||||
for (auto it : file_system_paths) {
|
||||
std::string type =
|
||||
it.second.is_string() ? it.second.GetString() : std::string();
|
||||
result[it.first] = type;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue