chore: bump chromium to 91.0.4448.0 (master) (#28009)
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs:2694187* chore: update patches * chore: media_internal_resources becomes resources Refs:2699022* chore: update patches * refactor: extensions::ViewType moved to mojom Refs:2710351* chore: might_have_observers has been removed Refs:2667839* refactor: CertVerifier is not in the network namespace anymore Refs:2689805* refactor: ExtensionUserScriptManager is now UserScriptManager Refs:2657617* refactor: content::SiteInstance::GetSiteForURL was removed Refs:2680274* refactor: MenuItemType was moved to mojom Refs:2071443* refactor: extensions::ViewType was moved to mojom Refs:2710351* refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs:2685601* refactor: blink::MenuItem::Type was moved to mojom Refs:2071443* refactor: CreateDataPipe deprecated form was removed Refs:2698090* refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs:2700637* chore: wire up activation_time in OSR Refs:2638372* chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c* 2752406: [LSC] Replace base::string16 with std::u16string in //ui2752406* 2752406: [LSC] Replace base::string16 with std::u16string in //ui2752406* 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id.2752932* 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer.2651385* 2734095: Introduce StoragePartitionId type to wrap current string representation.2734095* chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink.2743594* 2725403: Add URLLoaderClient::OnReceiveEarlyHints()2725403* 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer.2651385* 2721718: Move HostID to extensions::mojom::HostID2721718* 2733070: Rename observer to URLLoaderNetworkServiceObserver2733070* Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app2648046* 2752406: [LSC] Replace base::string16 with std::u16string in //ui2752406* only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias""2757472* 2757472: Reland "Reland "[LSC] Remove base::string16 alias""2757472* 2720306: [api] Remove deprecated [Shared]ArrayBuffer API2720306* Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289. * 2693008: Fix loading non-system cursors on Windows on browser_tests2693008* 2757472: Reland "Reland "[LSC] Remove base::string16 alias""2757472* undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation2707696* use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b. Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Electron Bot
GitHub
parent
6016e244fa
commit
a006cf681b
233 changed files with 1586 additions and 1469 deletions
|
|
@ -9,7 +9,6 @@
|
|||
#include <vector>
|
||||
|
||||
#include "base/memory/weak_ptr.h"
|
||||
#include "base/strings/string16.h"
|
||||
#include "third_party/skia/include/core/SkBitmap.h"
|
||||
#include "url/gurl.h"
|
||||
|
||||
|
|
@ -19,26 +18,26 @@ class NotificationDelegate;
|
|||
class NotificationPresenter;
|
||||
|
||||
struct NotificationAction {
|
||||
base::string16 type;
|
||||
base::string16 text;
|
||||
std::u16string type;
|
||||
std::u16string text;
|
||||
};
|
||||
|
||||
struct NotificationOptions {
|
||||
base::string16 title;
|
||||
base::string16 subtitle;
|
||||
base::string16 msg;
|
||||
std::u16string title;
|
||||
std::u16string subtitle;
|
||||
std::u16string msg;
|
||||
std::string tag;
|
||||
bool silent;
|
||||
GURL icon_url;
|
||||
SkBitmap icon;
|
||||
bool has_reply;
|
||||
base::string16 timeout_type;
|
||||
base::string16 reply_placeholder;
|
||||
base::string16 sound;
|
||||
base::string16 urgency; // Linux
|
||||
std::u16string timeout_type;
|
||||
std::u16string reply_placeholder;
|
||||
std::u16string sound;
|
||||
std::u16string urgency; // Linux
|
||||
std::vector<NotificationAction> actions;
|
||||
base::string16 close_button_text;
|
||||
base::string16 toast_xml;
|
||||
std::u16string close_button_text;
|
||||
std::u16string toast_xml;
|
||||
|
||||
NotificationOptions();
|
||||
~NotificationOptions();
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ bool NotificationPresenterWin::Init() {
|
|||
return temp_dir_.CreateUniqueTempDir();
|
||||
}
|
||||
|
||||
base::string16 NotificationPresenterWin::SaveIconToFilesystem(
|
||||
std::wstring NotificationPresenterWin::SaveIconToFilesystem(
|
||||
const SkBitmap& icon,
|
||||
const GURL& origin) {
|
||||
std::string filename;
|
||||
|
|
@ -85,12 +85,12 @@ base::string16 NotificationPresenterWin::SaveIconToFilesystem(
|
|||
}
|
||||
|
||||
base::ThreadRestrictions::ScopedAllowIO allow_io;
|
||||
base::FilePath path = temp_dir_.GetPath().Append(base::UTF8ToUTF16(filename));
|
||||
base::FilePath path = temp_dir_.GetPath().Append(base::UTF8ToWide(filename));
|
||||
if (base::PathExists(path))
|
||||
return path.value();
|
||||
if (SaveIconToPath(icon, path))
|
||||
return path.value();
|
||||
return base::UTF8ToUTF16(origin.spec());
|
||||
return base::UTF8ToWide(origin.spec());
|
||||
}
|
||||
|
||||
Notification* NotificationPresenterWin::CreateNotificationObject(
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#define SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_
|
||||
|
||||
#include "base/files/scoped_temp_dir.h"
|
||||
#include "base/strings/string16.h"
|
||||
#include "shell/browser/notifications/notification_presenter.h"
|
||||
|
||||
class GURL;
|
||||
|
|
@ -39,7 +38,7 @@ class NotificationPresenterWin : public NotificationPresenter {
|
|||
|
||||
bool Init();
|
||||
|
||||
base::string16 SaveIconToFilesystem(const SkBitmap& icon, const GURL& origin);
|
||||
std::wstring SaveIconToFilesystem(const SkBitmap& icon, const GURL& origin);
|
||||
|
||||
private:
|
||||
Notification* CreateNotificationObject(
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "third_party/skia/include/core/SkBitmap.h"
|
||||
|
||||
namespace electron {
|
||||
|
|
@ -49,13 +50,15 @@ void Win32Notification::Show(const NotificationOptions& options) {
|
|||
existing->tag_.clear();
|
||||
|
||||
this->notification_ref_ = std::move(existing->notification_ref_);
|
||||
this->notification_ref_.Set(options.title, options.msg, image);
|
||||
this->notification_ref_.Set(base::UTF16ToWide(options.title),
|
||||
base::UTF16ToWide(options.msg), image);
|
||||
// Need to remove the entry in the notifications set that
|
||||
// NotificationPresenter is holding
|
||||
existing->Destroy();
|
||||
} else {
|
||||
this->notification_ref_ =
|
||||
presenter->AddNotification(options.title, options.msg, image);
|
||||
presenter->AddNotification(base::UTF16ToWide(options.title),
|
||||
base::UTF16ToWide(options.msg), image);
|
||||
}
|
||||
|
||||
this->tag_ = options.tag;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "shell/browser/notifications/win/notification_presenter_win.h"
|
||||
#include "shell/browser/win/scoped_hstring.h"
|
||||
#include "shell/common/application_info.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
#include "ui/base/l10n/l10n_util_win.h"
|
||||
#include "ui/strings/grit/ui_strings.h"
|
||||
|
||||
using ABI::Windows::Data::Xml::Dom::IXmlAttribute;
|
||||
|
|
@ -132,15 +132,18 @@ HRESULT WindowsToastNotification::ShowInternal(
|
|||
// The custom xml takes priority over the preset template.
|
||||
if (!options.toast_xml.empty()) {
|
||||
REPORT_AND_RETURN_IF_FAILED(
|
||||
XmlDocumentFromString(options.toast_xml.c_str(), &toast_xml),
|
||||
XmlDocumentFromString(base::UTF16ToWide(options.toast_xml).c_str(),
|
||||
&toast_xml),
|
||||
"XML: Invalid XML");
|
||||
} else {
|
||||
auto* presenter_win = static_cast<NotificationPresenterWin*>(presenter());
|
||||
std::wstring icon_path =
|
||||
presenter_win->SaveIconToFilesystem(options.icon, options.icon_url);
|
||||
REPORT_AND_RETURN_IF_FAILED(
|
||||
GetToastXml(toast_manager_.Get(), options.title, options.msg, icon_path,
|
||||
options.timeout_type, options.silent, &toast_xml),
|
||||
GetToastXml(toast_manager_.Get(), base::UTF16ToWide(options.title),
|
||||
base::UTF16ToWide(options.msg), icon_path,
|
||||
base::UTF16ToWide(options.timeout_type), options.silent,
|
||||
&toast_xml),
|
||||
"XML: Failed to create XML document");
|
||||
}
|
||||
|
||||
|
|
@ -211,7 +214,7 @@ HRESULT WindowsToastNotification::GetToastXml(
|
|||
}
|
||||
|
||||
// Configure the toast's timeout settings
|
||||
if (timeout_type == base::ASCIIToUTF16("never")) {
|
||||
if (timeout_type == base::ASCIIToWide("never")) {
|
||||
REPORT_AND_RETURN_IF_FAILED(
|
||||
(SetXmlScenarioReminder(*toast_xml)),
|
||||
"XML: Setting \"scenario\" option on notification failed");
|
||||
|
|
@ -379,7 +382,7 @@ HRESULT WindowsToastNotification::SetXmlScenarioReminder(IXmlDocument* doc) {
|
|||
RETURN_IF_FAILED(content_attribute.As(&content_attribute_node));
|
||||
|
||||
// Set content attribute to Dismiss
|
||||
ScopedHString content_value(l10n_util::GetStringUTF16(IDS_APP_CLOSE));
|
||||
ScopedHString content_value(l10n_util::GetWideString(IDS_APP_CLOSE));
|
||||
if (!content_value.success())
|
||||
return E_FAIL;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue