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

Unified Diff: extensions/browser/updater/safe_manifest_parser.cc

Issue 924603003: Remove ManifestFetchData parameter from SafeManifestParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged latest from origin/master Created 5 years, 10 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
« no previous file with comments | « extensions/browser/updater/safe_manifest_parser.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/updater/safe_manifest_parser.cc
diff --git a/extensions/browser/updater/safe_manifest_parser.cc b/extensions/browser/updater/safe_manifest_parser.cc
index 2ab9a0571891a0444faeac99975366fc6c2bf54f..f40fc138d43e25036a14da10c671054f013fe020 100644
--- a/extensions/browser/updater/safe_manifest_parser.cc
+++ b/extensions/browser/updater/safe_manifest_parser.cc
@@ -19,9 +19,8 @@ using content::BrowserThread;
namespace extensions {
SafeManifestParser::SafeManifestParser(const std::string& xml,
- ManifestFetchData* fetch_data,
- const UpdateCallback& update_callback)
- : xml_(xml), fetch_data_(fetch_data), update_callback_(update_callback) {
+ const ResultsCallback& results_callback)
+ : xml_(xml), results_callback_(results_callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
@@ -63,17 +62,15 @@ bool SafeManifestParser::OnMessageReceived(const IPC::Message& message) {
void SafeManifestParser::OnParseUpdateManifestSucceeded(
const UpdateManifest::Results& results) {
- VLOG(2) << "parsing manifest succeeded (" << fetch_data_->full_url() << ")";
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- update_callback_.Run(*fetch_data_, &results);
+ results_callback_.Run(&results);
}
void SafeManifestParser::OnParseUpdateManifestFailed(
const std::string& error_message) {
- VLOG(2) << "parsing manifest failed (" << fetch_data_->full_url() << ")";
DCHECK_CURRENTLY_ON(BrowserThread::UI);
LOG(WARNING) << "Error parsing update manifest:\n" << error_message;
- update_callback_.Run(*fetch_data_, NULL);
+ results_callback_.Run(NULL);
}
} // namespace extensions
« no previous file with comments | « extensions/browser/updater/safe_manifest_parser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698