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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/shell_integration.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/service_process/service_process_control_browsertest.cc ('k') | chrome/browser/shell_integration_linux.cc » ('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.cc
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index 2b6fd6aafc4bb17671f07f9104a7cf55b1febac7..ebaf4158c023df9f8d5fc6f649eaf3e48b92a12e 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#if defined(OS_CHROMEOS)
@@ -21,7 +22,7 @@
#endif
#if !defined(OS_WIN)
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
#endif
@@ -112,7 +113,7 @@ void ShellIntegration::AppendProfileArgs(const base::FilePath& profile_path,
#if !defined(OS_WIN)
base::string16 ShellIntegration::GetAppShortcutsSubdirName() {
- if (chrome::VersionInfo::GetChannel() == version_info::Channel::CANARY)
+ if (chrome::GetChannel() == version_info::Channel::CANARY)
return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY);
return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME);
}
« chrome/browser/safe_browsing/protocol_manager.cc ('K') | « chrome/browser/service_process/service_process_control_browsertest.cc ('k') | chrome/browser/shell_integration_linux.cc » ('j') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698