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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/component_loader.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/extensions/api/tab_capture/tab_capture_performancetest.cc ('K') | « chrome/browser/extensions/chrome_extensions_browser_client.cc ('k') | chrome/browser/extensions/default_apps.cc » ('j') | chrome/browser/extensions/default_apps.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index e9fb7d1d6d492f36c4f85adcde7244c9f89f341b..60c2cbc3dbcdec8f2822fc65642e31bcd78b1157 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -23,14 +23,15 @@
#include "chrome/browser/search/hotword_service.h"
#include "chrome/browser/search/hotword_service_factory.h"
#include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/common/channel_info.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/grit/generated_resources.h"
#include "components/crx_file/id_util.h"
#include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/browser/signin_manager_base.h"
+#include "components/version_info/version_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/plugin_service.h"
#include "extensions/common/constants.h"
@@ -395,7 +396,7 @@ void ComponentLoader::AddGoogleNowExtension() {
// Enable the feature on trybots and trunk builds.
bool enabled_via_trunk_build =
- chrome::VersionInfo::GetChannel() == version_info::Channel::UNKNOWN;
+ chrome::GetChannel() == version_info::Channel::UNKNOWN;
bool is_authenticated =
SigninManagerFactory::GetForProfile(profile_)->IsAuthenticated();
« chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc ('K') | « chrome/browser/extensions/chrome_extensions_browser_client.cc ('k') | chrome/browser/extensions/default_apps.cc » ('j') | chrome/browser/extensions/default_apps.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698