OLD | NEW |
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 #include "chrome/browser/extensions/crx_installer.h" | 5 #include "chrome/browser/extensions/crx_installer.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "base/threading/thread_restrictions.h" | 21 #include "base/threading/thread_restrictions.h" |
22 #include "base/time/time.h" | 22 #include "base/time/time.h" |
23 #include "base/version.h" | 23 #include "base/version.h" |
24 #include "chrome/browser/chrome_notification_types.h" | 24 #include "chrome/browser/chrome_notification_types.h" |
25 #include "chrome/browser/extensions/convert_user_script.h" | 25 #include "chrome/browser/extensions/convert_user_script.h" |
26 #include "chrome/browser/extensions/convert_web_app.h" | 26 #include "chrome/browser/extensions/convert_web_app.h" |
27 #include "chrome/browser/extensions/crx_installer_error.h" | 27 #include "chrome/browser/extensions/crx_installer_error.h" |
28 #include "chrome/browser/extensions/extension_error_reporter.h" | 28 #include "chrome/browser/extensions/extension_error_reporter.h" |
29 #include "chrome/browser/extensions/extension_install_ui.h" | 29 #include "chrome/browser/extensions/extension_install_ui.h" |
30 #include "chrome/browser/extensions/extension_service.h" | 30 #include "chrome/browser/extensions/extension_service.h" |
| 31 #include "chrome/browser/extensions/install_tracker.h" |
| 32 #include "chrome/browser/extensions/install_tracker_factory.h" |
31 #include "chrome/browser/extensions/permissions_updater.h" | 33 #include "chrome/browser/extensions/permissions_updater.h" |
32 #include "chrome/browser/extensions/webstore_installer.h" | 34 #include "chrome/browser/extensions/webstore_installer.h" |
33 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
34 #include "chrome/browser/web_applications/web_app.h" | 36 #include "chrome/browser/web_applications/web_app.h" |
35 #include "chrome/common/chrome_paths.h" | 37 #include "chrome/common/chrome_paths.h" |
36 #include "chrome/common/extensions/extension_constants.h" | 38 #include "chrome/common/extensions/extension_constants.h" |
37 #include "chrome/common/extensions/extension_file_util.h" | 39 #include "chrome/common/extensions/extension_file_util.h" |
38 #include "chrome/common/extensions/extension_icon_set.h" | 40 #include "chrome/common/extensions/extension_icon_set.h" |
39 #include "chrome/common/extensions/manifest_url_handler.h" | 41 #include "chrome/common/extensions/manifest_url_handler.h" |
40 #include "content/public/browser/browser_thread.h" | 42 #include "content/public/browser/browser_thread.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, client_); | 171 BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE, client_); |
170 client_ = NULL; | 172 client_ = NULL; |
171 } | 173 } |
172 } | 174 } |
173 | 175 |
174 void CrxInstaller::InstallCrx(const base::FilePath& source_file) { | 176 void CrxInstaller::InstallCrx(const base::FilePath& source_file) { |
175 ExtensionService* service = service_weak_.get(); | 177 ExtensionService* service = service_weak_.get(); |
176 if (!service || service->browser_terminating()) | 178 if (!service || service->browser_terminating()) |
177 return; | 179 return; |
178 | 180 |
| 181 InstallTrackerFactory::GetForProfile(profile()) |
| 182 ->OnBeginCrxInstall(expected_id_); |
| 183 |
179 source_file_ = source_file; | 184 source_file_ = source_file; |
180 | 185 |
181 scoped_refptr<SandboxedUnpacker> unpacker( | 186 scoped_refptr<SandboxedUnpacker> unpacker( |
182 new SandboxedUnpacker(source_file, | 187 new SandboxedUnpacker(source_file, |
183 install_source_, | 188 install_source_, |
184 creation_flags_, | 189 creation_flags_, |
185 install_directory_, | 190 install_directory_, |
186 installer_task_runner_.get(), | 191 installer_task_runner_.get(), |
187 this)); | 192 this)); |
188 | 193 |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
867 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) | 872 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) |
868 return; | 873 return; |
869 | 874 |
870 if (client_) { | 875 if (client_) { |
871 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). | 876 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). |
872 client_->ConfirmReEnable(this, extension()); | 877 client_->ConfirmReEnable(this, extension()); |
873 } | 878 } |
874 } | 879 } |
875 | 880 |
876 } // namespace extensions | 881 } // namespace extensions |
OLD | NEW |