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

Side by Side Diff: extensions/browser/updater/safe_manifest_parser.h

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef EXTENSIONS_BROWSER_UPDATER_SAFE_MANIFEST_PARSER_H_ 5 #ifndef EXTENSIONS_BROWSER_UPDATER_SAFE_MANIFEST_PARSER_H_
6 #define EXTENSIONS_BROWSER_UPDATER_SAFE_MANIFEST_PARSER_H_ 6 #define EXTENSIONS_BROWSER_UPDATER_SAFE_MANIFEST_PARSER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "content/public/browser/utility_process_host_client.h" 13 #include "content/public/browser/utility_process_host_client.h"
14 #include "extensions/browser/updater/manifest_fetch_data.h" 14 #include "extensions/browser/updater/manifest_fetch_data.h"
15 #include "extensions/common/update_manifest.h" 15 #include "extensions/common/update_manifest.h"
16 16
17 namespace extensions { 17 namespace extensions {
18 18
19 // Utility class to handle doing xml parsing in a sandboxed utility process. 19 // Utility class to handle doing xml parsing in a sandboxed utility process.
20 class SafeManifestParser : public content::UtilityProcessHostClient { 20 class SafeManifestParser : public content::UtilityProcessHostClient {
21 public: 21 public:
22 // Callback that is invoked when the manifest results are ready. 22 // Callback that is invoked when the manifest results are ready.
23 typedef base::Callback<void(const ManifestFetchData&, 23 typedef base::Callback<void(const UpdateManifest::Results*)> ResultsCallback;
24 const UpdateManifest::Results*)> UpdateCallback;
25 24
26 // Takes ownership of |fetch_data|.
27 SafeManifestParser(const std::string& xml, 25 SafeManifestParser(const std::string& xml,
28 ManifestFetchData* fetch_data, 26 const ResultsCallback& results_callback);
29 const UpdateCallback& update_callback);
30 27
31 // Posts a task over to the IO loop to start the parsing of xml_ in a 28 // Posts a task over to the IO loop to start the parsing of xml_ in a
32 // utility process. 29 // utility process.
33 void Start(); 30 void Start();
34 31
35 private: 32 private:
36 ~SafeManifestParser() override; 33 ~SafeManifestParser() override;
37 34
38 // Creates the sandboxed utility process and tells it to start parsing. 35 // Creates the sandboxed utility process and tells it to start parsing.
39 void ParseInSandbox(); 36 void ParseInSandbox();
40 37
41 // content::UtilityProcessHostClient implementation. 38 // content::UtilityProcessHostClient implementation.
42 bool OnMessageReceived(const IPC::Message& message) override; 39 bool OnMessageReceived(const IPC::Message& message) override;
43 40
44 void OnParseUpdateManifestSucceeded(const UpdateManifest::Results& results); 41 void OnParseUpdateManifestSucceeded(const UpdateManifest::Results& results);
45 void OnParseUpdateManifestFailed(const std::string& error_message); 42 void OnParseUpdateManifestFailed(const std::string& error_message);
46 43
47 const std::string xml_; 44 const std::string xml_;
48 45
49 // Should be accessed only on UI thread. 46 // Should be accessed only on UI thread.
50 scoped_ptr<ManifestFetchData> fetch_data_; 47 ResultsCallback results_callback_;
51 UpdateCallback update_callback_;
52 48
53 DISALLOW_COPY_AND_ASSIGN(SafeManifestParser); 49 DISALLOW_COPY_AND_ASSIGN(SafeManifestParser);
54 }; 50 };
55 51
56 } // namespace extensions 52 } // namespace extensions
57 53
58 #endif // EXTENSIONS_BROWSER_UPDATER_SAFE_MANIFEST_PARSER_H_ 54 #endif // EXTENSIONS_BROWSER_UPDATER_SAFE_MANIFEST_PARSER_H_
OLDNEW
« no previous file with comments | « extensions/browser/updater/extension_downloader.cc ('k') | extensions/browser/updater/safe_manifest_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698