OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/unpacked_installer.h" | 5 #include "chrome/browser/extensions/unpacked_installer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
11 #include "base/threading/thread_restrictions.h" | 11 #include "base/threading/thread_restrictions.h" |
12 #include "chrome/browser/extensions/extension_error_reporter.h" | 12 #include "chrome/browser/extensions/extension_error_reporter.h" |
13 #include "chrome/browser/extensions/extension_install_prompt.h" | 13 #include "chrome/browser/extensions/extension_install_prompt.h" |
14 #include "chrome/browser/extensions/extension_install_ui.h" | |
15 #include "chrome/browser/extensions/extension_management.h" | 14 #include "chrome/browser/extensions/extension_management.h" |
16 #include "chrome/browser/extensions/extension_service.h" | 15 #include "chrome/browser/extensions/extension_service.h" |
17 #include "chrome/browser/extensions/permissions_updater.h" | 16 #include "chrome/browser/extensions/permissions_updater.h" |
18 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 18 #include "chrome/browser/ui/extensions/extension_install_ui_factory.h" |
19 #include "chrome/common/extensions/api/plugins/plugins_handler.h" | 19 #include "chrome/common/extensions/api/plugins/plugins_handler.h" |
20 #include "components/crx_file/id_util.h" | 20 #include "components/crx_file/id_util.h" |
21 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
22 #include "extensions/browser/extension_prefs.h" | 22 #include "extensions/browser/extension_prefs.h" |
23 #include "extensions/browser/extension_registry.h" | 23 #include "extensions/browser/extension_registry.h" |
| 24 #include "extensions/browser/install/extension_install_ui.h" |
24 #include "extensions/browser/install_flag.h" | 25 #include "extensions/browser/install_flag.h" |
25 #include "extensions/common/extension.h" | 26 #include "extensions/common/extension.h" |
26 #include "extensions/common/extension_l10n_util.h" | 27 #include "extensions/common/extension_l10n_util.h" |
27 #include "extensions/common/file_util.h" | 28 #include "extensions/common/file_util.h" |
28 #include "extensions/common/manifest.h" | 29 #include "extensions/common/manifest.h" |
29 #include "extensions/common/manifest_handlers/shared_module_info.h" | 30 #include "extensions/common/manifest_handlers/shared_module_info.h" |
30 #include "sync/api/string_ordinal.h" | 31 #include "sync/api/string_ordinal.h" |
31 | 32 |
32 using content::BrowserThread; | 33 using content::BrowserThread; |
33 using extensions::Extension; | 34 using extensions::Extension; |
(...skipping 21 matching lines...) Expand all Loading... |
55 private: | 56 private: |
56 scoped_ptr<ExtensionInstallPrompt> install_ui_; | 57 scoped_ptr<ExtensionInstallPrompt> install_ui_; |
57 scoped_refptr<const Extension> extension_; | 58 scoped_refptr<const Extension> extension_; |
58 base::Closure callback_; | 59 base::Closure callback_; |
59 }; | 60 }; |
60 | 61 |
61 SimpleExtensionLoadPrompt::SimpleExtensionLoadPrompt( | 62 SimpleExtensionLoadPrompt::SimpleExtensionLoadPrompt( |
62 const Extension* extension, | 63 const Extension* extension, |
63 Profile* profile, | 64 Profile* profile, |
64 const base::Closure& callback) | 65 const base::Closure& callback) |
65 : install_ui_(ExtensionInstallUI::CreateInstallPromptWithProfile( | 66 : extension_(extension), |
66 profile)), | |
67 extension_(extension), | |
68 callback_(callback) { | 67 callback_(callback) { |
| 68 scoped_ptr<extensions::ExtensionInstallUI> ui( |
| 69 extensions::CreateExtensionInstallUI(profile)); |
| 70 install_ui_.reset(new ExtensionInstallPrompt( |
| 71 profile, |
| 72 ui->GetDefaultInstallDialogParent(), |
| 73 NULL)); |
69 } | 74 } |
70 | 75 |
71 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() { | 76 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() { |
72 } | 77 } |
73 | 78 |
74 void SimpleExtensionLoadPrompt::ShowPrompt() { | 79 void SimpleExtensionLoadPrompt::ShowPrompt() { |
75 switch (ExtensionInstallPrompt::g_auto_confirm_for_tests) { | 80 switch (ExtensionInstallPrompt::g_auto_confirm_for_tests) { |
76 case ExtensionInstallPrompt::NONE: | 81 case ExtensionInstallPrompt::NONE: |
77 install_ui_->ConfirmInstall( | 82 install_ui_->ConfirmInstall( |
78 this, | 83 this, |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
316 | 321 |
317 PermissionsUpdater perms_updater(service_weak_->profile()); | 322 PermissionsUpdater perms_updater(service_weak_->profile()); |
318 perms_updater.InitializePermissions(extension()); | 323 perms_updater.InitializePermissions(extension()); |
319 perms_updater.GrantActivePermissions(extension()); | 324 perms_updater.GrantActivePermissions(extension()); |
320 | 325 |
321 service_weak_->OnExtensionInstalled( | 326 service_weak_->OnExtensionInstalled( |
322 extension(), syncer::StringOrdinal(), kInstallFlagInstallImmediately); | 327 extension(), syncer::StringOrdinal(), kInstallFlagInstallImmediately); |
323 } | 328 } |
324 | 329 |
325 } // namespace extensions | 330 } // namespace extensions |
OLD | NEW |