458b14b8ed
* chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch6318359patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref:6326575patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() |6326236* 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent |6244461* 6313744: Migrate views::Background factory methods to ColorVariant |6313744* 6314545: Remove multiple argument support from base::ToString() |6314545* 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() |6317362* 6308998: Add SettingAccess structured metrics event for DevTools |6308998* 6295214: Remove redundant state field in per-extension preferences |6295214NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
59 lines
1.9 KiB
C++
59 lines
1.9 KiB
C++
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/application_info.h"
|
|
|
|
#include "base/i18n/rtl.h"
|
|
#include "base/no_destructor.h"
|
|
#include "chrome/browser/browser_process.h"
|
|
#include "chrome/common/chrome_version.h"
|
|
#include "components/embedder_support/user_agent_utils.h"
|
|
#include "electron/electron_version.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "third_party/abseil-cpp/absl/strings/str_format.h"
|
|
|
|
namespace electron {
|
|
|
|
std::string& OverriddenApplicationName() {
|
|
static base::NoDestructor<std::string> overridden_application_name;
|
|
return *overridden_application_name;
|
|
}
|
|
|
|
std::string& OverriddenApplicationVersion() {
|
|
static base::NoDestructor<std::string> overridden_application_version;
|
|
return *overridden_application_version;
|
|
}
|
|
|
|
std::string GetPossiblyOverriddenApplicationName() {
|
|
std::string ret = OverriddenApplicationName();
|
|
if (!ret.empty())
|
|
return ret;
|
|
return GetApplicationName();
|
|
}
|
|
|
|
std::string GetApplicationUserAgent() {
|
|
// Construct user agent string.
|
|
Browser* browser = Browser::Get();
|
|
std::string name, user_agent;
|
|
if (!base::RemoveChars(browser->GetName(), " ", &name))
|
|
name = browser->GetName();
|
|
if (name == ELECTRON_PRODUCT_NAME) {
|
|
user_agent = "Chrome/" CHROME_VERSION_STRING " " ELECTRON_PRODUCT_NAME
|
|
"/" ELECTRON_VERSION_STRING;
|
|
} else {
|
|
user_agent = absl::StrFormat(
|
|
"%s/%s Chrome/%s " ELECTRON_PRODUCT_NAME "/" ELECTRON_VERSION_STRING,
|
|
name.c_str(), browser->GetVersion().c_str(), CHROME_VERSION_STRING);
|
|
}
|
|
return embedder_support::BuildUserAgentFromProduct(user_agent);
|
|
}
|
|
|
|
bool IsAppRTL() {
|
|
const std::string& locale = g_browser_process->GetApplicationLocale();
|
|
base::i18n::TextDirection text_direction =
|
|
base::i18n::GetTextDirectionForLocaleInStartUp(locale.c_str());
|
|
return text_direction == base::i18n::RIGHT_TO_LEFT;
|
|
}
|
|
|
|
} // namespace electron
|