chore: modernize ListValue usage in dict_util.mm and related files (#34661)
* chore: modernize ListValue usage in dict_util.mm and related files * use base::Value::{Dict,List} instead of raw base::Value * fix compile * fix build * fix build again
This commit is contained in:
parent
cd19a741b1
commit
11924bdbb2
14 changed files with 106 additions and 107 deletions
|
@ -242,7 +242,7 @@ void Browser::SetUserActivity(const std::string& type,
|
|||
|
||||
[[AtomApplication sharedApplication]
|
||||
setCurrentActivity:base::SysUTF8ToNSString(type)
|
||||
withUserInfo:DictionaryValueToNSDictionary(user_info)
|
||||
withUserInfo:DictionaryValueToNSDictionary(user_info.GetDict())
|
||||
withWebpageURL:net::NSURLWithGURL(GURL(url_string))];
|
||||
}
|
||||
|
||||
|
@ -264,7 +264,7 @@ void Browser::UpdateCurrentActivity(const std::string& type,
|
|||
base::DictionaryValue user_info) {
|
||||
[[AtomApplication sharedApplication]
|
||||
updateCurrentActivity:base::SysUTF8ToNSString(type)
|
||||
withUserInfo:DictionaryValueToNSDictionary(user_info)];
|
||||
withUserInfo:DictionaryValueToNSDictionary(user_info.GetDict())];
|
||||
}
|
||||
|
||||
bool Browser::WillContinueUserActivity(const std::string& type) {
|
||||
|
@ -281,25 +281,27 @@ void Browser::DidFailToContinueUserActivity(const std::string& type,
|
|||
}
|
||||
|
||||
bool Browser::ContinueUserActivity(const std::string& type,
|
||||
base::DictionaryValue user_info,
|
||||
base::DictionaryValue details) {
|
||||
base::Value::Dict user_info,
|
||||
base::Value::Dict details) {
|
||||
bool prevent_default = false;
|
||||
for (BrowserObserver& observer : observers_)
|
||||
observer.OnContinueUserActivity(&prevent_default, type, user_info, details);
|
||||
observer.OnContinueUserActivity(&prevent_default, type, user_info.Clone(),
|
||||
details.Clone());
|
||||
return prevent_default;
|
||||
}
|
||||
|
||||
void Browser::UserActivityWasContinued(const std::string& type,
|
||||
base::DictionaryValue user_info) {
|
||||
base::Value::Dict user_info) {
|
||||
for (BrowserObserver& observer : observers_)
|
||||
observer.OnUserActivityWasContinued(type, user_info);
|
||||
observer.OnUserActivityWasContinued(type, user_info.Clone());
|
||||
}
|
||||
|
||||
bool Browser::UpdateUserActivityState(const std::string& type,
|
||||
base::DictionaryValue user_info) {
|
||||
base::Value::Dict user_info) {
|
||||
bool prevent_default = false;
|
||||
for (BrowserObserver& observer : observers_)
|
||||
observer.OnUpdateUserActivityState(&prevent_default, type, user_info);
|
||||
observer.OnUpdateUserActivityState(&prevent_default, type,
|
||||
user_info.Clone());
|
||||
return prevent_default;
|
||||
}
|
||||
|
||||
|
@ -486,7 +488,8 @@ void Browser::DockSetIcon(v8::Isolate* isolate, v8::Local<v8::Value> icon) {
|
|||
}
|
||||
|
||||
void Browser::ShowAboutPanel() {
|
||||
NSDictionary* options = DictionaryValueToNSDictionary(about_panel_options_);
|
||||
NSDictionary* options =
|
||||
DictionaryValueToNSDictionary(about_panel_options_.GetDict());
|
||||
|
||||
// Credits must be a NSAttributedString instead of NSString
|
||||
NSString* credits = (NSString*)options[@"Credits"];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue