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

Unified Diff: chrome/browser/component_updater/component_updater_service.cc

Issue 375973003: Componentize component_updater: Use Configurator to build query parameters. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
Index: chrome/browser/component_updater/component_updater_service.cc
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
index 50efcb670c329e4b4de484984f07a4bad5103eef..3fa2aca335d12fdca14abb265d4438a02933ee22 100644
--- a/chrome/browser/component_updater/component_updater_service.cc
+++ b/chrome/browser/component_updater/component_updater_service.cc
@@ -29,7 +29,6 @@
#include "chrome/browser/component_updater/crx_update_item.h"
#include "chrome/browser/component_updater/update_checker.h"
#include "chrome/browser/component_updater/update_response.h"
-#include "chrome/common/chrome_version_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/resource_controller.h"
#include "content/public/browser/resource_throttle.h"
@@ -263,8 +262,6 @@ class CrxUpdateService : public ComponentUpdateService, public OnDemandUpdater {
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
- const Version chrome_version_;
-
bool running_;
ObserverList<Observer> observer_list_;
@@ -282,7 +279,6 @@ CrxUpdateService::CrxUpdateService(Configurator* config)
GetSequencedTaskRunnerWithShutdownBehavior(
BrowserThread::GetBlockingPool()->GetSequenceToken(),
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)),
- chrome_version_(chrome::VersionInfo().Version()),
running_(false) {
}
@@ -720,7 +716,8 @@ void CrxUpdateService::OnUpdateCheckSucceeded(
}
if (!it->manifest.browser_min_version.empty()) {
- if (IsVersionNewer(chrome_version_, it->manifest.browser_min_version)) {
+ if (IsVersionNewer(config_->GetBrowserVersion(),
+ it->manifest.browser_min_version)) {
// The component is not compatible with this Chrome version.
VLOG(1) << "Ignoring incompatible component: " << crx->id;
ChangeItemState(crx, CrxUpdateItem::kNoUpdate);

Powered by Google App Engine
This is Rietveld 408576698