Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1458)

Unified Diff: chrome/common/channel_info_win.cc

Issue 2799013002: Monitor crashpad_handler for crashes [sometimes] (Closed)
Patch Set: Address review feedback (scottmg) Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chrome_exe_main_win.cc ('k') | chrome/install_static/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/channel_info_win.cc
diff --git a/chrome/common/channel_info_win.cc b/chrome/common/channel_info_win.cc
index 6e0874a03960555d5a76b5384b06ed5ad5715e09..cd8a3dd2ce803d88677edfb9de67936188164573 100644
--- a/chrome/common/channel_info_win.cc
+++ b/chrome/common/channel_info_win.cc
@@ -8,8 +8,7 @@
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/install_static/install_details.h"
-#include "components/version_info/version_info.h"
+#include "chrome/install_static/install_util.h"
namespace chrome {
@@ -21,7 +20,7 @@ std::string GetChannelString() {
"422460 VersionInfo::GetVersionStringModifier"));
#if defined(GOOGLE_CHROME_BUILD)
- base::string16 channel(install_static::InstallDetails::Get().channel());
+ base::string16 channel(install_static::GetChromeChannelName());
#if defined(SYZYASAN)
if (base::debug::IsBinaryInstrumented())
channel += L" SyzyASan";
@@ -33,21 +32,7 @@ std::string GetChannelString() {
}
version_info::Channel GetChannel() {
-#if defined(GOOGLE_CHROME_BUILD)
- base::string16 channel(install_static::InstallDetails::Get().channel());
-
- if (channel.empty()) {
- return version_info::Channel::STABLE;
- } else if (channel == L"beta") {
- return version_info::Channel::BETA;
- } else if (channel == L"dev") {
- return version_info::Channel::DEV;
- } else if (channel == L"canary") {
- return version_info::Channel::CANARY;
- }
-#endif
-
- return version_info::Channel::UNKNOWN;
+ return install_static::GetChromeChannel();
}
} // namespace chrome
« no previous file with comments | « chrome/app/chrome_exe_main_win.cc ('k') | chrome/install_static/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698