Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37048592
en ru br
Репозитории ALT
S:117.0.5938.132-alt1
3.0: 0.9.12-alt7
www.altlinux.org/Changes

Группа :: Сети/WWW
Пакет: chromium

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: 0003-ALT-Set-appropriate-desktop-file-name-for-default-br.patch
Скачать


From c9c4a4f9a44305150be84f385760ff7c32548070 Mon Sep 17 00:00:00 2001
From: Alexey Gladkov <legion@altlinux.org>
Date: Fri, 14 Oct 2016 01:24:54 +0300
Subject: [PATCH] ALT: Set appropriate desktop file name for default browser
 check
---
 chrome/browser/shell_integration_linux.cc | 2 +-
 chrome/common/channel_info_posix.cc       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 1e7552bf0bc..dfbd240941a 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -407,21 +407,21 @@ std::string GetProgramClassName() {
 std::string GetProgramClassClass() {
   std::unique_ptr<base::Environment> env(base::Environment::Create());
   return internal::GetProgramClassClass(*base::CommandLine::ForCurrentProcess(),
                                         chrome::GetDesktopName(env.get()));
 }
 
 std::string GetIconName() {
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   return "google-chrome";
 #else  // BUILDFLAG(CHROMIUM_BRANDING)
-  return "chromium-browser";
+  return "chromium";
 #endif
 }
 
 bool GetExistingShortcutContents(base::Environment* env,
                                  const base::FilePath& desktop_filename,
                                  std::string* output) {
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
   std::vector<base::FilePath> search_paths = GetDataSearchLocations(env);
diff --git a/chrome/common/channel_info_posix.cc b/chrome/common/channel_info_posix.cc
index 240a5dfde96..4e0adc19e73 100644
--- a/chrome/common/channel_info_posix.cc
+++ b/chrome/common/channel_info_posix.cc
@@ -113,21 +113,21 @@ std::string GetDesktopName(base::Environment* env) {
       // Extended stable is not differentiated from regular stable.
       return "google-chrome.desktop";
   }
 #else  // BUILDFLAG(CHROMIUM_BRANDING)
   // Allow $CHROME_DESKTOP to override the built-in value, so that development
   // versions can set themselves as the default without interfering with
   // non-official, packaged versions using the built-in value.
   std::string name;
   if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty())
     return name;
-  return "chromium-browser.desktop";
+  return "chromium.desktop";
 #endif
 }
 #endif  // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
 
 version_info::Channel GetChannel() {
   return GetChannelImpl().channel;
 }
 
 bool IsExtendedStableChannel() {
   return GetChannelImpl().is_extended_stable;
-- 
2.25.4
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin