github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: base::Value::Dict -> base::DictValue

Browse Source 
https://chromium-review.googlesource.com/c/chromium/src/+/7513889
This commit is contained in:
Samuel Maddock
2026-02-02 19:51:38 -05:00
parent 1e0bbc3c08
commit a144b12f49
85 changed files with 323 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell/browser/mac/dict_util.h
View File

@@ -11,10 +11,10 @@
namespace electron {
NSArray* ListValueToNSArray(const base::Value::List& value);
base::Value::List NSArrayToValue(NSArray* arr);
NSDictionary* DictionaryValueToNSDictionary(const base::Value::Dict& value);
base::Value::Dict NSDictionaryToValue(NSDictionary* dict);
NSArray* ListValueToNSArray(const base::ListValue& value);
base::ListValue NSArrayToValue(NSArray* arr);
NSDictionary* DictionaryValueToNSDictionary(const base::DictValue& value);
base::DictValue NSDictionaryToValue(NSDictionary* dict);
} // namespace electron

12
shell/browser/mac/dict_util.mm
View File

@@ -13,7 +13,7 @@
namespace electron {
NSArray* ListValueToNSArray(const base::Value::List& value) {
NSArray* ListValueToNSArray(const base::ListValue& value) {
const auto json = base::WriteJson(value);
if (!json.has_value())
return nil;
@@ -26,8 +26,8 @@ NSArray* ListValueToNSArray(const base::Value::List& value) {
return obj;
}
base::Value::List NSArrayToValue(NSArray* arr) {
base::Value::List result;
base::ListValue NSArrayToValue(NSArray* arr) {
base::ListValue result;
if (!arr)
return result;
@@ -54,7 +54,7 @@ base::Value::List NSArrayToValue(NSArray* arr) {
return result;
}
NSDictionary* DictionaryValueToNSDictionary(const base::Value::Dict& value) {
NSDictionary* DictionaryValueToNSDictionary(const base::DictValue& value) {
const auto json = base::WriteJson(value);
if (!json.has_value())
return nil;
@@ -67,8 +67,8 @@ NSDictionary* DictionaryValueToNSDictionary(const base::Value::Dict& value) {
return obj;
}
base::Value::Dict NSDictionaryToValue(NSDictionary* dict) {
base::Value::Dict result;
base::DictValue NSDictionaryToValue(NSDictionary* dict) {
base::DictValue result;
if (!dict)
return result;

4
shell/browser/mac/electron_application.mm
View File

@@ -163,7 +163,7 @@ inline void dispatch_sync_main(dispatch_block_t block) {
dispatch_sync_main(^{
std::string activity_type(
base::SysNSStringToUTF8(userActivity.activityType));
base::Value::Dict user_info =
base::DictValue user_info =
electron::NSDictionaryToValue(userActivity.userInfo);
electron::Browser* browser = electron::Browser::Get();
@@ -192,7 +192,7 @@ inline void dispatch_sync_main(dispatch_block_t block) {
dispatch_async(dispatch_get_main_queue(), ^{
std::string activity_type(
base::SysNSStringToUTF8(userActivity.activityType));
base::Value::Dict user_info =
base::DictValue user_info =
electron::NSDictionaryToValue(userActivity.userInfo);
electron::Browser* browser = electron::Browser::Get();