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

Side by Side Diff: components/update_client/action_update.h

Issue 2483513002: Revert of Makes the component installers return a Result instead of a bool. (Closed)
Patch Set: Created 4 years, 1 month 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_ 5 #ifndef COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_
6 #define COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_ 6 #define COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 virtual void OnDownloadStart(CrxUpdateItem* item) = 0; 51 virtual void OnDownloadStart(CrxUpdateItem* item) = 0;
52 virtual void OnDownloadSuccess( 52 virtual void OnDownloadSuccess(
53 CrxUpdateItem* item, 53 CrxUpdateItem* item,
54 const CrxDownloader::Result& download_result) = 0; 54 const CrxDownloader::Result& download_result) = 0;
55 virtual void OnDownloadError( 55 virtual void OnDownloadError(
56 CrxUpdateItem* item, 56 CrxUpdateItem* item,
57 const CrxDownloader::Result& download_result) = 0; 57 const CrxDownloader::Result& download_result) = 0;
58 virtual void OnInstallStart(CrxUpdateItem* item) = 0; 58 virtual void OnInstallStart(CrxUpdateItem* item) = 0;
59 virtual void OnInstallSuccess(CrxUpdateItem* item) = 0; 59 virtual void OnInstallSuccess(CrxUpdateItem* item) = 0;
60 virtual void OnInstallError(CrxUpdateItem* item, 60 virtual void OnInstallError(CrxUpdateItem* item,
61 ErrorCategory error_category, 61 UnpackerError error,
62 int error,
63 int extended_error) = 0; 62 int extended_error) = 0;
64 63
65 void StartDownload(CrxUpdateItem* item); 64 void StartDownload(CrxUpdateItem* item);
66 void DownloadComplete(const std::string& id, 65 void DownloadComplete(const std::string& id,
67 const CrxDownloader::Result& download_result); 66 const CrxDownloader::Result& download_result);
68 67
69 // Called when progress is being made downloading a CRX. The progress may 68 // Called when progress is being made downloading a CRX. The progress may
70 // not monotonically increase due to how the CRX downloader switches between 69 // not monotonically increase due to how the CRX downloader switches between
71 // different downloaders and fallback urls. 70 // different downloaders and fallback urls.
72 void DownloadProgress(const std::string& id, 71 void DownloadProgress(const std::string& id,
73 const CrxDownloader::Result& download_result); 72 const CrxDownloader::Result& download_result);
74 73
75 void StartInstall(CrxUpdateItem* item, const base::FilePath& crx_path); 74 void StartInstall(CrxUpdateItem* item, const base::FilePath& crx_path);
76 void InstallComplete(const std::string& id, 75 void InstallComplete(const std::string& id,
77 ErrorCategory error_category, 76 UnpackerError error,
78 int error,
79 int extended_error); 77 int extended_error);
80 78
81 void StartUnpackOnBlockingTaskRunner(CrxUpdateItem* item, 79 void StartUnpackOnBlockingTaskRunner(CrxUpdateItem* item,
82 const base::FilePath& crx_path); 80 const base::FilePath& crx_path);
83 void UnpackCompleteOnBlockingTaskRunner( 81 void UnpackCompleteOnBlockingTaskRunner(
84 CrxUpdateItem* item, 82 CrxUpdateItem* item,
85 const base::FilePath& crx_path, 83 const base::FilePath& crx_path,
86 const ComponentUnpacker::Result& result); 84 const ComponentUnpacker::Result& result);
87 85
88 void StartInstallOnBlockingTaskRunner(CrxUpdateItem* item, 86 void StartInstallOnBlockingTaskRunner(CrxUpdateItem* item,
89 const base::FilePath& crx_path, 87 const base::FilePath& crx_path,
90 const base::FilePath& unpack_path); 88 const base::FilePath& unpack_path);
91 void InstallCompleteOnBlockingTaskRunner(CrxUpdateItem* item, 89 void InstallCompleteOnBlockingTaskRunner(CrxUpdateItem* item,
92 const base::FilePath& crx_path, 90 const base::FilePath& crx_path,
93 ErrorCategory error_category, 91 UnpackerError error,
94 int error,
95 int extended_error); 92 int extended_error);
96 93
97 CrxInstaller::Result DoInstall(CrxUpdateItem* item, 94 // TODO(sorin): make this function return a result data type to convey
98 const base::FilePath& crx_path, 95 // extended error information.
99 const base::FilePath& unpack_path); 96 UnpackerError DoInstall(CrxUpdateItem* item,
97 const base::FilePath& crx_path,
98 const base::FilePath& unpack_path);
100 99
101 // Downloads updates for one CRX id only. 100 // Downloads updates for one CRX id only.
102 std::unique_ptr<CrxDownloader> crx_downloader_; 101 std::unique_ptr<CrxDownloader> crx_downloader_;
103 102
104 // Unpacks one CRX. 103 // Unpacks one CRX.
105 scoped_refptr<ComponentUnpacker> unpacker_; 104 scoped_refptr<ComponentUnpacker> unpacker_;
106 105
107 DISALLOW_COPY_AND_ASSIGN(ActionUpdate); 106 DISALLOW_COPY_AND_ASSIGN(ActionUpdate);
108 }; 107 };
109 108
(...skipping 12 matching lines...) Expand all
122 std::vector<GURL> GetUrls(const CrxUpdateItem* item) override; 121 std::vector<GURL> GetUrls(const CrxUpdateItem* item) override;
123 std::string GetHash(const CrxUpdateItem* item) override; 122 std::string GetHash(const CrxUpdateItem* item) override;
124 void OnDownloadStart(CrxUpdateItem* item) override; 123 void OnDownloadStart(CrxUpdateItem* item) override;
125 void OnDownloadSuccess(CrxUpdateItem* item, 124 void OnDownloadSuccess(CrxUpdateItem* item,
126 const CrxDownloader::Result& download_result) override; 125 const CrxDownloader::Result& download_result) override;
127 void OnDownloadError(CrxUpdateItem* item, 126 void OnDownloadError(CrxUpdateItem* item,
128 const CrxDownloader::Result& download_result) override; 127 const CrxDownloader::Result& download_result) override;
129 void OnInstallStart(CrxUpdateItem* item) override; 128 void OnInstallStart(CrxUpdateItem* item) override;
130 void OnInstallSuccess(CrxUpdateItem* item) override; 129 void OnInstallSuccess(CrxUpdateItem* item) override;
131 void OnInstallError(CrxUpdateItem* item, 130 void OnInstallError(CrxUpdateItem* item,
132 ErrorCategory error_category, 131 UnpackerError error,
133 int error,
134 int extended_error) override; 132 int extended_error) override;
135 133
136 DISALLOW_COPY_AND_ASSIGN(ActionUpdateDiff); 134 DISALLOW_COPY_AND_ASSIGN(ActionUpdateDiff);
137 }; 135 };
138 136
139 class ActionUpdateFull : public ActionUpdate { 137 class ActionUpdateFull : public ActionUpdate {
140 public: 138 public:
141 static std::unique_ptr<Action> Create(); 139 static std::unique_ptr<Action> Create();
142 140
143 private: 141 private:
144 ActionUpdateFull(); 142 ActionUpdateFull();
145 ~ActionUpdateFull() override; 143 ~ActionUpdateFull() override;
146 144
147 // ActionUpdate overrides. 145 // ActionUpdate overrides.
148 bool IsBackgroundDownload(const CrxUpdateItem* item) override; 146 bool IsBackgroundDownload(const CrxUpdateItem* item) override;
149 std::vector<GURL> GetUrls(const CrxUpdateItem* item) override; 147 std::vector<GURL> GetUrls(const CrxUpdateItem* item) override;
150 std::string GetHash(const CrxUpdateItem* item) override; 148 std::string GetHash(const CrxUpdateItem* item) override;
151 void OnDownloadStart(CrxUpdateItem* item) override; 149 void OnDownloadStart(CrxUpdateItem* item) override;
152 void OnDownloadSuccess(CrxUpdateItem* item, 150 void OnDownloadSuccess(CrxUpdateItem* item,
153 const CrxDownloader::Result& download_result) override; 151 const CrxDownloader::Result& download_result) override;
154 void OnDownloadError(CrxUpdateItem* item, 152 void OnDownloadError(CrxUpdateItem* item,
155 const CrxDownloader::Result& download_result) override; 153 const CrxDownloader::Result& download_result) override;
156 void OnInstallStart(CrxUpdateItem* item) override; 154 void OnInstallStart(CrxUpdateItem* item) override;
157 void OnInstallSuccess(CrxUpdateItem* item) override; 155 void OnInstallSuccess(CrxUpdateItem* item) override;
158 void OnInstallError(CrxUpdateItem* item, 156 void OnInstallError(CrxUpdateItem* item,
159 ErrorCategory error_category, 157 UnpackerError error,
160 int error,
161 int extended_error) override; 158 int extended_error) override;
162 159
163 DISALLOW_COPY_AND_ASSIGN(ActionUpdateFull); 160 DISALLOW_COPY_AND_ASSIGN(ActionUpdateFull);
164 }; 161 };
165 162
166 } // namespace update_client 163 } // namespace update_client
167 164
168 #endif // COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_ 165 #endif // COMPONENTS_UPDATE_CLIENT_ACTION_UPDATE_H_
OLDNEW
« no previous file with comments | « components/component_updater/default_component_installer_unittest.cc ('k') | components/update_client/action_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698