bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert defined(OS_XXX) to BUILDFLAG(IS_XXX) in libcef

Browse Source 
See https://crbug.com/1234043 for background.
This commit is contained in:
Marshall Greenblatt
2022-01-24 12:58:02 -05:00
parent 7b0bb931b1
commit ebde595370
68 changed files with 280 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libcef/browser/net/chrome_scheme_handler.cc
View File

@ -92,7 +92,7 @@ const char* kAllowedWebUIHosts[] = {
chrome::kChromeUIPrintHost,
content::kChromeUIProcessInternalsHost,
content::kChromeUIResourcesHost,
#if defined(OS_WIN) || defined(OS_LINUX)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
chrome::kChromeUISandboxHost,
#endif
content::kChromeUIServiceWorkerInternalsHost,
@ -197,11 +197,11 @@ void GetDebugURLs(std::vector<std::string>* urls) {
}
std::string GetOSType() {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
return "Windows";
#elif defined(OS_MAC)
#elif BUILDFLAG(IS_MAC)
return "Mac OS X";
#elif defined(OS_LINUX)
#elif BUILDFLAG(IS_LINUX)
return "Linux";
#else
return "Unknown";
@ -209,10 +209,10 @@ std::string GetOSType() {
}
std::string GetCommandLine() {
#if defined(OS_WIN)
#if BUILDFLAG(IS_WIN)
return base::WideToUTF8(
base::CommandLine::ForCurrentProcess()->GetCommandLineString());
#elif defined(OS_POSIX)
#elif BUILDFLAG(IS_POSIX)
std::string command_line = "";
using ArgvList = std::vector<std::string>;
const ArgvList& argv = base::CommandLine::ForCurrentProcess()->argv();