Thorium_Archive/thorium-mirror
1
0
Fork 0
mirror of https://github.com/Alex313031/thorium.git synced 2025-01-10 11:57:48 -03:00
Code Issues Projects Releases Packages Wiki Activity

move defined(OS) > BUILDFLAG(IS)

Browse source
This commit is contained in:
Alexander David Frick 2022-01-18 08:00:57 -06:00 committed by GitHub
parent b41f9ac16c
commit 207b653d6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
chrome/browser/background/background_mode_manager.cc
View file

@ -1,4 +1,4 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Copyright (c) 2022 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
@ -79,7 +79,7 @@
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/image/image_family.h" #include "ui/gfx/image/image_family.h"
#if defined(OS_WIN) #if BUILDFLAG(IS_WIN)
#include "chrome/browser/win/app_icon.h" #include "chrome/browser/win/app_icon.h"
#endif #endif
@ -371,7 +371,7 @@ BackgroundModeManager::~BackgroundModeManager() {
// static // static
void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) { void BackgroundModeManager::RegisterPrefs(PrefRegistrySimple* registry) {
#if defined(OS_MAC) #if BUILDFLAG(IS_MAC)
registry->RegisterBooleanPref(prefs::kUserRemovedLoginItem, false); registry->RegisterBooleanPref(prefs::kUserRemovedLoginItem, false);
registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false);
registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false);
@ -875,7 +875,7 @@ void BackgroundModeManager::UpdateEnableLaunchOnStartup() {
// Gets the image for the status tray icon, at the correct size for the current // Gets the image for the status tray icon, at the correct size for the current
// platform and display settings. // platform and display settings.
gfx::ImageSkia GetStatusTrayIcon() { gfx::ImageSkia GetStatusTrayIcon() {
#if defined(OS_WIN) #if BUILDFLAG(IS_WIN)
// On Windows, use GetSmallAppIconSize to get the correct image size. The // On Windows, use GetSmallAppIconSize to get the correct image size. The
// user's "text size" setting in Windows determines how large the system tray // user's "text size" setting in Windows determines how large the system tray
// icon should be. // icon should be.
@ -892,10 +892,10 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia(); return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia(); return family->CreateExact(size).AsImageSkia();
#elif defined(OS_LINUX) || defined(OS_CHROMEOS) #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_PRODUCT_LOGO_128); IDR_PRODUCT_LOGO_128);
#elif defined(OS_MAC) #elif BUILDFLAG(IS_MAC)
return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_STATUS_TRAY_ICON); IDR_STATUS_TRAY_ICON);
#else #else
@ -910,7 +910,7 @@ void BackgroundModeManager::CreateStatusTrayIcon() {
// Since there are multiple profiles which share the status tray, we now // Since there are multiple profiles which share the status tray, we now
// use the browser process to keep track of it. // use the browser process to keep track of it.
#if !defined(OS_MAC) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ #if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
!BUILDFLAG(IS_CHROMEOS_LACROS) !BUILDFLAG(IS_CHROMEOS_LACROS)
if (!status_tray_) if (!status_tray_)
status_tray_ = g_browser_process->status_tray(); status_tray_ = g_browser_process->status_tray();