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

Unified Diff: chrome/browser/extensions/updater/extension_updater.cc

Issue 226023003: Create CrxInstaller directly in WebstoreInstaller (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android compilation fix (again). Created 6 years, 8 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/extensions/updater/extension_updater.cc
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc
index 4afe45c2fc97acfa1fe3125634f6d3a3cb597b2b..14d993470458cce417e7309c6167e9fa846a72f9 100644
--- a/chrome/browser/extensions/updater/extension_updater.cc
+++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -102,16 +102,14 @@ ExtensionUpdater::FetchedCRXFile::FetchedCRXFile(
const std::string& i,
const base::FilePath& p,
bool file_ownership_passed,
- const GURL& u,
const std::set<int>& request_ids)
: extension_id(i),
path(p),
file_ownership_passed(file_ownership_passed),
- download_url(u),
request_ids(request_ids) {}
ExtensionUpdater::FetchedCRXFile::FetchedCRXFile()
- : path(), file_ownership_passed(true), download_url() {}
+ : path(), file_ownership_passed(true) {}
ExtensionUpdater::FetchedCRXFile::~FetchedCRXFile() {}
@@ -485,8 +483,7 @@ void ExtensionUpdater::OnExtensionDownloadFinished(
VLOG(2) << download_url << " written to " << path.value();
- FetchedCRXFile fetched(id, path, file_ownership_passed, download_url,
- request_ids);
+ FetchedCRXFile fetched(id, path, file_ownership_passed, request_ids);
fetched_crx_files_.push(fetched);
// MaybeInstallCRXFile() removes extensions from |in_progress_ids_| after
@@ -560,7 +557,6 @@ void ExtensionUpdater::MaybeInstallCRXFile() {
if (service_->UpdateExtension(crx_file.extension_id,
crx_file.path,
crx_file.file_ownership_passed,
- crx_file.download_url,
&installer)) {
crx_install_is_running_ = true;
current_crx_file_ = crx_file;
« no previous file with comments | « chrome/browser/extensions/updater/extension_updater.h ('k') | chrome/browser/extensions/updater/extension_updater_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698