Commit a3b11f5a authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Yet more GOOGLE_CHROME_BUILD -> GOOGLE_CHROME_BRANDING.

Some minor refactorings too keep GOOGLE_CHROME_BRANDING out of .h files.

Bug: 961769
Change-Id: I4fd7463abd37b915586c5f6b98dbeae5e85bc263
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1884757
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarRobert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710030}
parent d60a1f05
......@@ -5,6 +5,7 @@
#include "chrome/browser/ui/startup/startup_tab_provider.h"
#include "base/metrics/histogram_macros.h"
#include "build/branding_buildflags.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/profile_resetter/triggered_profile_resetter.h"
#include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
......@@ -226,10 +227,8 @@ StartupTabs StartupTabProviderImpl::GetNewTabPageTabsForState(
StartupTabs StartupTabProviderImpl::GetPostCrashTabsForState(
bool has_incompatible_applications) {
StartupTabs tabs;
#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
if (has_incompatible_applications)
tabs.emplace_back(GetIncompatibleApplicationsUrl(), false);
#endif // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
AddIncompatibleApplicationsUrl(&tabs);
return tabs;
}
......@@ -241,14 +240,14 @@ GURL StartupTabProviderImpl::GetWelcomePageUrl(bool use_later_run_variant) {
: url;
}
#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
// static
GURL StartupTabProviderImpl::GetIncompatibleApplicationsUrl() {
void StartupTabProviderImpl::AddIncompatibleApplicationsUrl(StartupTabs* tabs) {
#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
UMA_HISTOGRAM_BOOLEAN("IncompatibleApplicationsPage.AddedPostCrash", true);
GURL url(chrome::kChromeUISettingsURL);
return url.Resolve("incompatibleApplications");
tabs->emplace_back(url.Resolve("incompatibleApplications", false);
#endif // defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
}
#endif // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
// static
GURL StartupTabProviderImpl::GetTriggeredResetSettingsUrl() {
......
......@@ -136,11 +136,9 @@ class StartupTabProviderImpl : public StartupTabProvider {
// TODO(hcarmona): it might be possible to deprecate use_later_run_variant.
static GURL GetWelcomePageUrl(bool use_later_run_variant);
#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
// Gets the URL for the Incompatible Applications subpage of the Chrome
// settings.
static GURL GetIncompatibleApplicationsUrl();
#endif // defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
// In branded Windows builds, adds the URL for the Incompatible Applications
// subpage of the Chrome settings.
static void AddIncompatibleApplicationsUrl(StartupTabs* tabs);
// Gets the URL for the page which offers to reset the user's profile
// settings.
......
......@@ -102,11 +102,7 @@ bool GcpCrashReporterClient::IsRunningUnattended() {
}
bool GcpCrashReporterClient::GetCollectStatsConsent() {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
return GetGCPWCollectStatsConsent();
#else
return false;
#endif
}
bool GcpCrashReporterClient::EnableBreakpadForProcess(
......
......@@ -88,9 +88,7 @@ void ConfigureGcpCrashReporting(const base::CommandLine& command_line) {
process_type.empty(), "GCPW DLL", "", dll_main_cmd_line.GetProgram(),
{base::UTF16ToUTF8(dll_main_cmd_line.GetArgs()[0])});
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
SetCommonCrashKeys(command_line);
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
}
} // namespace credential_provider
......@@ -11,6 +11,7 @@
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "build/branding_buildflags.h"
#include "chrome/credential_provider/common/gcp_strings.h"
#include "chrome/credential_provider/gaiacp/gcp_crash_reporter_client.h"
#include "chrome/credential_provider/gaiacp/logging.h"
......@@ -21,7 +22,7 @@ namespace {
constexpr wchar_t kCrashpadDumpsFolder[] = L"GCPW Crashpad";
#if defined(GOOGLE_CHROME_BUILD)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
void SetCurrentVersionCrashKey() {
static crash_reporter::CrashKeyString<32> version_key("current-version");
version_key.Clear();
......@@ -36,7 +37,7 @@ void SetCurrentVersionCrashKey() {
version_key.Set(base::WideToUTF8(version_str));
}
}
#endif // defined(GOOGLE_CHROME_BUILD)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Returns the SYSTEM version of TEMP. We do this instead of GetTempPath so
// that both elevated and SYSTEM runs share the same directory.
......@@ -80,15 +81,19 @@ base::FilePath GetFolderForCrashDumps() {
return system_temp_dir.Append(kCrashpadDumpsFolder);
}
#if defined(GOOGLE_CHROME_BUILD)
void SetCommonCrashKeys(const base::CommandLine& command_line) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
SetCurrentVersionCrashKey();
crash_keys::SetSwitchesFromCommandLine(command_line, nullptr);
#endif
}
bool GetGCPWCollectStatsConsent() {
#if !BUILDFLAG(GOOGLE_CHROME_BRANDING)
return false;
#else
// This value is provided by Omaha during install based on how the installer
// is tagged. The installer is tagged based on the consent checkbox found
// on the download page.
......@@ -104,8 +109,7 @@ bool GetGCPWCollectStatsConsent() {
KEY_QUERY_VALUE | KEY_WOW64_32KEY);
key.ReadValueDW(kRegUsageStatsName, &collect_stats);
return collect_stats == 1;
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
}
#endif // defined(GOOGLE_CHROME_BUILD)
} // namespace credential_provider
......@@ -40,15 +40,13 @@ void InitializeGcpwCrashReporting(GcpCrashReporterClient* crash_client);
// database.
base::FilePath GetFolderForCrashDumps();
#if defined(GOOGLE_CHROME_BUILD)
// No-op in Chromium builds.
void SetCommonCrashKeys(const base::CommandLine& command_line);
// Returns the system level registry keys for crash dump upload consent.
// Always returns false in Chromium builds.
bool GetGCPWCollectStatsConsent();
#endif // defined(GOOGLE_CHROME_BUILD)
} // namespace credential_provider
#endif // CHROME_CREDENTIAL_PROVIDER_GAIACP_GCP_CRASH_REPORTING_UTILS_H_
......@@ -40,9 +40,9 @@ void ConfigureGcpInstallerCrashReporting(
crash_reporter::InitializeCrashpadWithEmbeddedHandler(true, "GCPW Installer",
"", base::FilePath());
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
SetCommonCrashKeys(command_line);
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
static crash_reporter::CrashKeyString<64> operation("operation");
bool is_uninstall =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment