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

Unified Diff: chrome/common/channel_info_win.cc

Issue 2694743002: Remove uses of GoogleUpdateSettings::GetChromeChannel in Chrome. (Closed)
Patch Set: Created 3 years, 10 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/main_dll_loader_win.cc ('k') | no next file » | 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 b4fb9833988f1d1a098c5578c19347d0bd74914d..6e0874a03960555d5a76b5384b06ed5ad5715e09 100644
--- a/chrome/common/channel_info_win.cc
+++ b/chrome/common/channel_info_win.cc
@@ -4,15 +4,11 @@
#include "chrome/common/channel_info.h"
-#include "base/base_paths.h"
#include "base/debug/profiler.h"
-#include "base/files/file_path.h"
-#include "base/path_service.h"
#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/installer/util/google_update_settings.h"
-#include "chrome/installer/util/install_util.h"
+#include "chrome/install_static/install_details.h"
#include "components/version_info/version_info.h"
namespace chrome {
@@ -25,12 +21,7 @@ std::string GetChannelString() {
"422460 VersionInfo::GetVersionStringModifier"));
#if defined(GOOGLE_CHROME_BUILD)
- base::FilePath module;
- base::string16 channel;
- if (PathService::Get(base::FILE_MODULE, &module)) {
- bool is_system_install = !InstallUtil::IsPerUserInstall(module);
- channel = GoogleUpdateSettings::GetChromeChannel(is_system_install);
- }
+ base::string16 channel(install_static::InstallDetails::Get().channel());
#if defined(SYZYASAN)
if (base::debug::IsBinaryInstrumented())
channel += L" SyzyASan";
@@ -43,13 +34,7 @@ std::string GetChannelString() {
version_info::Channel GetChannel() {
#if defined(GOOGLE_CHROME_BUILD)
- std::wstring channel(L"unknown");
-
- base::FilePath module;
- if (PathService::Get(base::FILE_MODULE, &module)) {
- bool is_system_install = !InstallUtil::IsPerUserInstall(module);
- channel = GoogleUpdateSettings::GetChromeChannel(is_system_install);
- }
+ base::string16 channel(install_static::InstallDetails::Get().channel());
if (channel.empty()) {
return version_info::Channel::STABLE;
« no previous file with comments | « chrome/app/main_dll_loader_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698