![Electron Bot](/assets/img/avatar_default.png)
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/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 //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * 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 .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * 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_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/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 creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * 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>
351 lines
11 KiB
C++
351 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/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;
|
|
|
|
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, base::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, base::size(path))))
|
|
item->working_dir = base::FilePath(path);
|
|
|
|
int icon_index;
|
|
if (SUCCEEDED(
|
|
shell_link->GetIconLocation(path, base::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, base::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
|