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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/mac/master_prefs.mm

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/history/chrome_history_client.cc ('K') | « chrome/browser/mac/keystone_glue.mm ('k') | chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc » ('j') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/mac/master_prefs.mm
diff --git a/chrome/browser/mac/master_prefs.mm b/chrome/browser/mac/master_prefs.mm
index 01c33b3f19f4074f6f5eed02ff7017f3201de5c5..1ee7c6b74cff475359bd805122b06a81d189553b 100644
--- a/chrome/browser/mac/master_prefs.mm
+++ b/chrome/browser/mac/master_prefs.mm
@@ -6,8 +6,9 @@
#include "base/files/file_util.h"
#include "base/mac/foundation_util.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_paths_internal.h"
-#include "chrome/common/chrome_version_info.h"
+#include "components/version_info/version_info.h"
namespace {
@@ -31,7 +32,7 @@ namespace master_prefs {
base::FilePath MasterPrefsPath() {
#if defined(GOOGLE_CHROME_BUILD)
// Don't load master preferences for the canary.
- version_info::Channel channel = chrome::VersionInfo::GetChannel();
+ version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::CANARY)
return base::FilePath();
#endif // GOOGLE_CHROME_BUILD
« chrome/browser/history/chrome_history_client.cc ('K') | « chrome/browser/mac/keystone_glue.mm ('k') | chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc » ('j') | chrome/browser/media/media_capture_devices_dispatcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698