7e59d784a0
* chore: bump chromium in DEPS to 101.0.4911.0
* chore: bump chromium in DEPS to 101.0.4913.0
* chore: bump chromium in DEPS to 101.0.4915.0
* chore: bump chromium in DEPS to 101.0.4917.0
* chore: bump chromium in DEPS to 101.0.4919.0
* chore: bump chromium in DEPS to 101.0.4921.0
* chore: bump chromium in DEPS to 101.0.4923.0
* chore: bump chromium in DEPS to 101.0.4925.0
* chore: bump chromium in DEPS to 101.0.4927.0
* chore: bump chromium in DEPS to 101.0.4929.0
* chore: update patches
* chore: bump chromium in DEPS to 101.0.4931.0
* chore: update patches
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1824792: Migrate DisplayClient to the new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1824792
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* chore: reconcile patches with main rebase
* chore: bump chromium in DEPS to 101.0.4933.0
* chore: update patches
* 3329593: [Fenced Frame] Ensure to support external protocols in a fenced frame
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3329593
* 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* 3446451: Use forward decl of ImageSkiaRep in //ui/gfx/image/image_skia.h
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3446451
* 3499818: partition_alloc: Rename AllocFlags to AllocWithFlags
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499818
* chore: bump chromium in DEPS to 101.0.4935.0
* chore: update patches
* 3463286: partition_alloc: Move PartitionAlloc into the own namespaces (15 of N)
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3463286
* 3506590: Reland "Support ChromeOS external protocol dialog for Fenced Frame navigations"
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3506590
* 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3475388
Actual fixes in 1880987: Convert URLLoaderReqeust from //content to new Mojo types | https://chromium-review.googlesource.com/c/chromium/src/+/1880987 The change in the roll started causing the legacy types to fail
* chore: missing SkRegion include
* 3499600: Introduce blink::WebCssOrigin
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3499600
* fixup!: 3503874: Remove base::size(), base::empty(), and base::data().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3503874
* chore: bump chromium in DEPS to 101.0.4937.0
* chore: update patches
* 3500826: [locales] Refactor locales for ios
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3500826
* 3509531: Make some public Blink media files private
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3509531
* 3497377: bluetooth: Add BluetoothDevice.forget()
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3497377
* chore: bump chromium in DEPS to 101.0.4939.0
* chore: bump chromium in DEPS to 101.0.4941.0
* 3514804: Deprecate all existing uses of mojo_base.mojom.{Dictionary,List}Value.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3514804
* 3502592: Delete PPAPI init/shutdown code in //pdf.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3502592
* chore: update patches
* fixup! 3502592: Delete PPAPI init/shutdown code in //pdf.
* chore: bump chromium in DEPS to 101.0.4943.0
* chore: fix lint, remove unneeded headers
* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
* update mojo calls in offscreen patch
* update hunspell filenames
* chore: bump chromium in DEPS to 101.0.4945.0
* chore: update patches
* fix offscreen patch again
* chore: bump chromium in DEPS to 101.0.4947.0
* chore: update patches
* chore: bump chromium in DEPS to 101.0.4949.0
* support unseasoned pdf
* update patches
* chore: update patches
* chore: [IWYU] include missing skia headers
* chore: bump chromium in DEPS to 101.0.4951.0
* chore: update patches
* 3457645: media: Remove IsKeySystemsUpdateNeeded()
https://chromium-review.googlesource.com/c/chromium/src/+/3457645
* chore: bump chromium in DEPS to 102.0.4952.2
* chore: update patches
* 3488672: Add documentId as a parameter in tabs.connect() and tabs.sendMessage().
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3488672
* 3508375: Fix an issue dangerous dialog is not shown for some apk download
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3508375
* chore: bump chromium in DEPS to 102.0.4953.0
* chore: update patches
* 3510189: Harden up drag and drop support across same-process boundaries.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3510189
* 3526815: Remove hardcoded colors from chrome/browser/ui/views/overlay/.
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3526815
* chore: bump chromium in DEPS to 102.0.4955.0
* build: add af and ur locale to manifests
3498914 [locales] Add af and ur to desktop
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3498914
* fixup! build: add af and ur locale to manifests
* chore: bump chromium in DEPS to 102.0.4957.0
* 3529090: gin: set JS flags before v8 initialization
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3529090
chore: fix code shear in chromium/gin_enable_disable_v8_platform.patch
* chore: update patches
* 3536433: [network] Rename data_path and http_cache_path from _path to _directory.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3536433
* 3111565: Relocated Page.printToPDF implementation to //components
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3111565
refactor: inject E args to PrintRequestedPages() and ScriptedPrintCallback
TODO: currently passes a placeholder for job_settings. We have other
code paths that inject settings from electron_api_web_contents.cc.
Should those be injected here as well? (CC @codebytere)
* fixup! 3111565: Relocated Page.printToPDF implementation to //components
* fixup! 3111565: Relocated Page.printToPDF implementation to //components
* 3520025: Make "libcxx_abi_unstable" not a gn arg
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3520025
build: since it is no longer a gn arg, patch it in
* chore: change usages of std::vector with const elements (#33373)
* chore: bump chromium in DEPS to 102.0.4959.0
* chore: update patches
* build: iwyu base/threading/platform_thread.h
* 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3525774
refactor: copy upstream impl of GetPermissionStatusForCurrentDocument into +ElectronPermissionManager
* use gclient_gn_args_from instead of hand-copying
* checkout mac on mac
* chore: update patches
* Revert "checkout mac on mac"
This reverts commit fe9ccf49ec6139868ccf2272c2016cefa3f32769.
* fixup! 3525774: Add GPSForCurrentDocument() into PermissionControllerDelegate.
* fixup! 3457645: media: Remove IsKeySystemsUpdateNeeded()
add nogncheck
* fix: set .eslintrc.json to root to avoid cascade to chromium eslintrc
* Xref: 6dfdf79b8c
Xref: https://reviews.llvm.org/D101458
Upstream added a CMakeLists.txt in an include dir ¯\_(ツ)_/¯ and
so it must be enumerated in filenames.libcxxabi.gni
* 3511268: Remove unused headers from cxx17_backports.h
https://chromium-review.googlesource.com/c/chromium/src/+/3511268
use std::size instead of base::size
* iwyu: SkPaint
3488428: [includes] Fix transitive includes of SkImageEncoder
* chore: [IWYU] include missing skia headers
* fixup! 3511268: Remove unused headers from cxx17_backports.h
* chore: bump chromium in DEPS to 102.0.4961.0
* chore: update patches
* fixup! 3475388: Remove mojo::InterfacePtr<T> and mojo::InterfacePtrInfo<T>
chore: remove unused #include
* fixup! 3510189: Harden up drag and drop support across same-process boundaries. | https://chromium-review.googlesource.com/c/chromium/src/+/3510189
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>
359 lines
11 KiB
C++
359 lines
11 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/win/jump_list.h"
|
|
|
|
#include <propkey.h> // for PKEY_* constants
|
|
|
|
#include "base/cxx17_backports.h"
|
|
#include "base/logging.h"
|
|
#include "base/win/scoped_co_mem.h"
|
|
#include "base/win/scoped_propvariant.h"
|
|
#include "base/win/win_util.h"
|
|
|
|
namespace {
|
|
|
|
using electron::JumpListCategory;
|
|
using electron::JumpListItem;
|
|
using electron::JumpListResult;
|
|
|
|
bool AppendTask(const JumpListItem& item, IObjectCollection* collection) {
|
|
DCHECK(collection);
|
|
|
|
CComPtr<IShellLink> link;
|
|
if (FAILED(link.CoCreateInstance(CLSID_ShellLink)) ||
|
|
FAILED(link->SetPath(item.path.value().c_str())) ||
|
|
FAILED(link->SetArguments(item.arguments.c_str())) ||
|
|
FAILED(link->SetWorkingDirectory(item.working_dir.value().c_str())) ||
|
|
FAILED(link->SetDescription(item.description.c_str())))
|
|
return false;
|
|
|
|
// SetDescription limits the size of the parameter to INFOTIPSIZE (1024),
|
|
// which suggests rejection when exceeding that limit, but experimentation
|
|
// has shown that descriptions longer than 260 characters cause a silent
|
|
// failure, despite SetDescription returning the success code S_OK.
|
|
if (item.description.size() > 260)
|
|
return false;
|
|
|
|
if (!item.icon_path.empty() &&
|
|
FAILED(link->SetIconLocation(item.icon_path.value().c_str(),
|
|
item.icon_index)))
|
|
return false;
|
|
|
|
CComQIPtr<IPropertyStore> property_store(link);
|
|
if (!base::win::SetStringValueForPropertyStore(property_store, PKEY_Title,
|
|
item.title.c_str()))
|
|
return false;
|
|
|
|
return SUCCEEDED(collection->AddObject(link));
|
|
}
|
|
|
|
bool AppendSeparator(IObjectCollection* collection) {
|
|
DCHECK(collection);
|
|
|
|
CComPtr<IShellLink> shell_link;
|
|
if (SUCCEEDED(shell_link.CoCreateInstance(CLSID_ShellLink))) {
|
|
CComQIPtr<IPropertyStore> property_store(shell_link);
|
|
if (base::win::SetBooleanValueForPropertyStore(
|
|
property_store, PKEY_AppUserModel_IsDestListSeparator, true))
|
|
return SUCCEEDED(collection->AddObject(shell_link));
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool AppendFile(const JumpListItem& item, IObjectCollection* collection) {
|
|
DCHECK(collection);
|
|
|
|
CComPtr<IShellItem> file;
|
|
if (SUCCEEDED(SHCreateItemFromParsingName(item.path.value().c_str(), NULL,
|
|
IID_PPV_ARGS(&file))))
|
|
return SUCCEEDED(collection->AddObject(file));
|
|
|
|
return false;
|
|
}
|
|
|
|
bool GetShellItemFileName(IShellItem* shell_item, base::FilePath* file_name) {
|
|
DCHECK(shell_item);
|
|
DCHECK(file_name);
|
|
|
|
base::win::ScopedCoMem<wchar_t> file_name_buffer;
|
|
if (SUCCEEDED(
|
|
shell_item->GetDisplayName(SIGDN_FILESYSPATH, &file_name_buffer))) {
|
|
*file_name = base::FilePath(file_name_buffer.get());
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool ConvertShellLinkToJumpListItem(IShellLink* shell_link,
|
|
JumpListItem* item) {
|
|
DCHECK(shell_link);
|
|
DCHECK(item);
|
|
|
|
item->type = JumpListItem::Type::kTask;
|
|
wchar_t path[MAX_PATH];
|
|
if (FAILED(shell_link->GetPath(path, std::size(path), nullptr, 0)))
|
|
return false;
|
|
|
|
item->path = base::FilePath(path);
|
|
|
|
CComQIPtr<IPropertyStore> property_store = shell_link;
|
|
base::win::ScopedPropVariant prop;
|
|
if (SUCCEEDED(
|
|
property_store->GetValue(PKEY_Link_Arguments, prop.Receive())) &&
|
|
(prop.get().vt == VT_LPWSTR)) {
|
|
item->arguments = prop.get().pwszVal;
|
|
}
|
|
|
|
if (SUCCEEDED(property_store->GetValue(PKEY_Title, prop.Receive())) &&
|
|
(prop.get().vt == VT_LPWSTR)) {
|
|
item->title = prop.get().pwszVal;
|
|
}
|
|
|
|
if (SUCCEEDED(shell_link->GetWorkingDirectory(path, std::size(path))))
|
|
item->working_dir = base::FilePath(path);
|
|
|
|
int icon_index;
|
|
if (SUCCEEDED(
|
|
shell_link->GetIconLocation(path, std::size(path), &icon_index))) {
|
|
item->icon_path = base::FilePath(path);
|
|
item->icon_index = icon_index;
|
|
}
|
|
|
|
wchar_t item_desc[INFOTIPSIZE];
|
|
if (SUCCEEDED(shell_link->GetDescription(item_desc, std::size(item_desc))))
|
|
item->description = item_desc;
|
|
|
|
return true;
|
|
}
|
|
|
|
// Convert IObjectArray of IShellLink & IShellItem to std::vector.
|
|
void ConvertRemovedJumpListItems(IObjectArray* in,
|
|
std::vector<JumpListItem>* out) {
|
|
DCHECK(in);
|
|
DCHECK(out);
|
|
|
|
UINT removed_count;
|
|
if (SUCCEEDED(in->GetCount(&removed_count) && (removed_count > 0))) {
|
|
out->reserve(removed_count);
|
|
JumpListItem item;
|
|
IShellItem* shell_item;
|
|
IShellLink* shell_link;
|
|
for (UINT i = 0; i < removed_count; ++i) {
|
|
if (SUCCEEDED(in->GetAt(i, IID_PPV_ARGS(&shell_item)))) {
|
|
item.type = JumpListItem::Type::kFile;
|
|
GetShellItemFileName(shell_item, &item.path);
|
|
out->push_back(item);
|
|
shell_item->Release();
|
|
} else if (SUCCEEDED(in->GetAt(i, IID_PPV_ARGS(&shell_link)))) {
|
|
if (ConvertShellLinkToJumpListItem(shell_link, &item))
|
|
out->push_back(item);
|
|
shell_link->Release();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
JumpListItem::JumpListItem() = default;
|
|
JumpListItem::JumpListItem(const JumpListItem&) = default;
|
|
JumpListItem::~JumpListItem() = default;
|
|
JumpListCategory::JumpListCategory() = default;
|
|
JumpListCategory::JumpListCategory(const JumpListCategory&) = default;
|
|
JumpListCategory::~JumpListCategory() = default;
|
|
|
|
JumpList::JumpList(const std::wstring& app_id) : app_id_(app_id) {
|
|
destinations_.CoCreateInstance(CLSID_DestinationList);
|
|
}
|
|
|
|
JumpList::~JumpList() = default;
|
|
|
|
bool JumpList::Begin(int* min_items, std::vector<JumpListItem>* removed_items) {
|
|
DCHECK(destinations_);
|
|
if (!destinations_)
|
|
return false;
|
|
|
|
if (FAILED(destinations_->SetAppID(app_id_.c_str())))
|
|
return false;
|
|
|
|
UINT min_slots;
|
|
CComPtr<IObjectArray> removed;
|
|
if (FAILED(destinations_->BeginList(&min_slots, IID_PPV_ARGS(&removed))))
|
|
return false;
|
|
|
|
if (min_items)
|
|
*min_items = min_slots;
|
|
|
|
if (removed_items)
|
|
ConvertRemovedJumpListItems(removed, removed_items);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool JumpList::Abort() {
|
|
DCHECK(destinations_);
|
|
if (!destinations_)
|
|
return false;
|
|
|
|
return SUCCEEDED(destinations_->AbortList());
|
|
}
|
|
|
|
bool JumpList::Commit() {
|
|
DCHECK(destinations_);
|
|
if (!destinations_)
|
|
return false;
|
|
|
|
return SUCCEEDED(destinations_->CommitList());
|
|
}
|
|
|
|
bool JumpList::Delete() {
|
|
DCHECK(destinations_);
|
|
if (!destinations_)
|
|
return false;
|
|
|
|
return SUCCEEDED(destinations_->DeleteList(app_id_.c_str()));
|
|
}
|
|
|
|
// This method will attempt to append as many items to the Jump List as
|
|
// possible, and will return a single error code even if multiple things
|
|
// went wrong in the process. To get detailed information about what went
|
|
// wrong enable runtime logging.
|
|
JumpListResult JumpList::AppendCategory(const JumpListCategory& category) {
|
|
DCHECK(destinations_);
|
|
if (!destinations_)
|
|
return JumpListResult::kGenericError;
|
|
|
|
if (category.items.empty())
|
|
return JumpListResult::kSuccess;
|
|
|
|
CComPtr<IObjectCollection> collection;
|
|
if (FAILED(collection.CoCreateInstance(CLSID_EnumerableObjectCollection))) {
|
|
return JumpListResult::kGenericError;
|
|
}
|
|
|
|
auto result = JumpListResult::kSuccess;
|
|
// Keep track of how many items were actually appended to the category.
|
|
int appended_count = 0;
|
|
for (const auto& item : category.items) {
|
|
switch (item.type) {
|
|
case JumpListItem::Type::kTask:
|
|
if (AppendTask(item, collection))
|
|
++appended_count;
|
|
else
|
|
LOG(ERROR) << "Failed to append task '" << item.title
|
|
<< "' "
|
|
"to Jump List.";
|
|
break;
|
|
|
|
case JumpListItem::Type::kSeparator:
|
|
if (category.type == JumpListCategory::Type::kTasks) {
|
|
if (AppendSeparator(collection))
|
|
++appended_count;
|
|
} else {
|
|
LOG(ERROR) << "Can't append separator to Jump List category "
|
|
<< "'" << category.name << "'. "
|
|
<< "Separators are only allowed in the standard 'Tasks' "
|
|
"Jump List category.";
|
|
result = JumpListResult::kCustomCategorySeparatorError;
|
|
}
|
|
break;
|
|
|
|
case JumpListItem::Type::kFile:
|
|
if (AppendFile(item, collection))
|
|
++appended_count;
|
|
else
|
|
LOG(ERROR) << "Failed to append '" << item.path.value()
|
|
<< "' "
|
|
"to Jump List.";
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (appended_count == 0)
|
|
return result;
|
|
|
|
if ((static_cast<size_t>(appended_count) < category.items.size()) &&
|
|
(result == JumpListResult::kSuccess)) {
|
|
result = JumpListResult::kGenericError;
|
|
}
|
|
|
|
CComQIPtr<IObjectArray> items(collection);
|
|
|
|
if (category.type == JumpListCategory::Type::kTasks) {
|
|
if (FAILED(destinations_->AddUserTasks(items))) {
|
|
LOG(ERROR) << "Failed to append items to the standard Tasks category.";
|
|
if (result == JumpListResult::kSuccess)
|
|
result = JumpListResult::kGenericError;
|
|
}
|
|
} else {
|
|
HRESULT hr = destinations_->AppendCategory(category.name.c_str(), items);
|
|
if (FAILED(hr)) {
|
|
if (hr == static_cast<HRESULT>(0x80040F03)) {
|
|
LOG(ERROR) << "Failed to append custom category "
|
|
<< "'" << category.name << "' "
|
|
<< "to Jump List due to missing file type registration.";
|
|
result = JumpListResult::kMissingFileTypeRegistrationError;
|
|
} else if (hr == E_ACCESSDENIED) {
|
|
LOG(ERROR) << "Failed to append custom category "
|
|
<< "'" << category.name << "' "
|
|
<< "to Jump List due to system privacy settings.";
|
|
result = JumpListResult::kCustomCategoryAccessDeniedError;
|
|
} else {
|
|
LOG(ERROR) << "Failed to append custom category "
|
|
<< "'" << category.name << "' to Jump List.";
|
|
if (result == JumpListResult::kSuccess)
|
|
result = JumpListResult::kGenericError;
|
|
}
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
// This method will attempt to append as many categories to the Jump List
|
|
// as possible, and will return a single error code even if multiple things
|
|
// went wrong in the process. To get detailed information about what went
|
|
// wrong enable runtime logging.
|
|
JumpListResult JumpList::AppendCategories(
|
|
const std::vector<JumpListCategory>& categories) {
|
|
DCHECK(destinations_);
|
|
if (!destinations_)
|
|
return JumpListResult::kGenericError;
|
|
|
|
auto result = JumpListResult::kSuccess;
|
|
for (const auto& category : categories) {
|
|
auto latestResult = JumpListResult::kSuccess;
|
|
switch (category.type) {
|
|
case JumpListCategory::Type::kTasks:
|
|
case JumpListCategory::Type::kCustom:
|
|
latestResult = AppendCategory(category);
|
|
break;
|
|
|
|
case JumpListCategory::Type::kRecent:
|
|
if (FAILED(destinations_->AppendKnownCategory(KDC_RECENT))) {
|
|
LOG(ERROR) << "Failed to append Recent category to Jump List.";
|
|
latestResult = JumpListResult::kGenericError;
|
|
}
|
|
break;
|
|
|
|
case JumpListCategory::Type::kFrequent:
|
|
if (FAILED(destinations_->AppendKnownCategory(KDC_FREQUENT))) {
|
|
LOG(ERROR) << "Failed to append Frequent category to Jump List.";
|
|
latestResult = JumpListResult::kGenericError;
|
|
}
|
|
break;
|
|
}
|
|
// Keep the first non-generic error code as only one can be returned from
|
|
// the function (so try to make it the most useful one).
|
|
if (((result == JumpListResult::kSuccess) ||
|
|
(result == JumpListResult::kGenericError)) &&
|
|
(latestResult != JumpListResult::kSuccess))
|
|
result = latestResult;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
} // namespace electron
|