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

Unified Diff: chrome/browser/ui/app_list/app_list_service_mac.mm

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
Index: chrome/browser/ui/app_list/app_list_service_mac.mm
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.mm b/chrome/browser/ui/app_list/app_list_service_mac.mm
index 9679c0ef3b6d037c1beaad8c8dc0acfca9db1d84..a40081709ef465d397ab8214f3989cf7522f516a 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac.mm
@@ -28,12 +28,13 @@
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/browser/web_applications/web_app_mac.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
#include "chrome/common/mac/app_mode_common.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/google_chrome_strings.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/manifest_handlers/file_handler_info.h"
@@ -89,7 +90,7 @@ const CGFloat kDistanceMovedOnShow = 20;
scoped_ptr<web_app::ShortcutInfo> GetAppListShortcutInfo(
const base::FilePath& profile_path) {
scoped_ptr<web_app::ShortcutInfo> shortcut_info(new web_app::ShortcutInfo);
- version_info::Channel channel = chrome::VersionInfo::GetChannel();
+ version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::CANARY) {
shortcut_info->title =
l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME_CANARY);
@@ -112,7 +113,7 @@ void CreateAppListShim(const base::FilePath& profile_path) {
GetAppListShortcutInfo(profile_path);
ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
- version_info::Channel channel = chrome::VersionInfo::GetChannel();
+ version_info::Channel channel = chrome::GetChannel();
if (channel == version_info::Channel::CANARY) {
#if defined(GOOGLE_CHROME_BUILD)
shortcut_info->favicon.Add(
« no previous file with comments | « chrome/browser/tracing/crash_service_uploader.cc ('k') | chrome/browser/ui/apps/chrome_app_window_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698