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

Unified Diff: chrome/common/chrome_version_info_win.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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/common/chrome_version_info_posix.cc ('k') | chrome/common/cloud_print/cloud_print_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_version_info_win.cc
diff --git a/chrome/common/chrome_version_info_win.cc b/chrome/common/chrome_version_info_win.cc
deleted file mode 100644
index f620c8ecf3c5543c7960b8bf0f59db687d5404e0..0000000000000000000000000000000000000000
--- a/chrome/common/chrome_version_info_win.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/common/chrome_version_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"
-
-namespace chrome {
-
-// static
-std::string VersionInfo::GetVersionStringModifier() {
- // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
- // fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "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);
- GoogleUpdateSettings::GetChromeChannelAndModifiers(is_system_install,
- &channel);
- }
-#if defined(SYZYASAN)
- if (base::debug::IsBinaryInstrumented())
- channel += L" SyzyASan";
-#endif
- return base::UTF16ToASCII(channel);
-#else
- return std::string();
-#endif
-}
-
-// static
-version_info::Channel VersionInfo::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);
- }
-
- 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;
-}
-
-} // namespace chrome
« no previous file with comments | « chrome/common/chrome_version_info_posix.cc ('k') | chrome/common/cloud_print/cloud_print_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698