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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/shell_integration_linux.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
« chrome/browser/safe_browsing/protocol_manager.cc ('K') | « chrome/browser/shell_integration.cc ('k') | chrome/browser/shell_integration_mac.mm » ('j') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/shell_integration_linux.cc
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 3c646b3ba2181466505f12b63a7b2182641eab81..17fe4ef94af3f264f8dc0fa073aed748d45e88ac 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -42,9 +42,10 @@
#include "base/threading/thread_restrictions.h"
#include "build/build_config.h"
#include "chrome/browser/shell_integration.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "grit/chrome_unscaled_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -586,8 +587,7 @@ std::string GetProgramClassName() {
std::string GetDesktopName(base::Environment* env) {
#if defined(GOOGLE_CHROME_BUILD)
- version_info::Channel product_channel(
- chrome::VersionInfo::GetChannel());
+ version_info::Channel product_channel(chrome::GetChannel());
switch (product_channel) {
case version_info::Channel::DEV:
return "google-chrome-unstable.desktop";
« chrome/browser/safe_browsing/protocol_manager.cc ('K') | « chrome/browser/shell_integration.cc ('k') | chrome/browser/shell_integration_mac.mm » ('j') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698