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 26 matching lines...) Expand all Loading... |
60 private: | 61 private: |
61 scoped_ptr<ExtensionInstallPrompt> install_ui_; | 62 scoped_ptr<ExtensionInstallPrompt> install_ui_; |
62 scoped_refptr<const Extension> extension_; | 63 scoped_refptr<const Extension> extension_; |
63 base::Closure callback_; | 64 base::Closure callback_; |
64 }; | 65 }; |
65 | 66 |
66 SimpleExtensionLoadPrompt::SimpleExtensionLoadPrompt( | 67 SimpleExtensionLoadPrompt::SimpleExtensionLoadPrompt( |
67 const Extension* extension, | 68 const Extension* extension, |
68 Profile* profile, | 69 Profile* profile, |
69 const base::Closure& callback) | 70 const base::Closure& callback) |
70 : install_ui_(ExtensionInstallUI::CreateInstallPromptWithProfile( | 71 : extension_(extension), callback_(callback) { |
71 profile)), | 72 scoped_ptr<extensions::ExtensionInstallUI> ui( |
72 extension_(extension), | 73 extensions::CreateExtensionInstallUI(profile)); |
73 callback_(callback) { | 74 install_ui_.reset(new ExtensionInstallPrompt( |
| 75 profile, ui->GetDefaultInstallDialogParent(), NULL)); |
74 } | 76 } |
75 | 77 |
76 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() { | 78 SimpleExtensionLoadPrompt::~SimpleExtensionLoadPrompt() { |
77 } | 79 } |
78 | 80 |
79 void SimpleExtensionLoadPrompt::ShowPrompt() { | 81 void SimpleExtensionLoadPrompt::ShowPrompt() { |
80 switch (ExtensionInstallPrompt::g_auto_confirm_for_tests) { | 82 switch (ExtensionInstallPrompt::g_auto_confirm_for_tests) { |
81 case ExtensionInstallPrompt::NONE: | 83 case ExtensionInstallPrompt::NONE: |
82 install_ui_->ConfirmInstall( | 84 install_ui_->ConfirmInstall( |
83 this, | 85 this, |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 | 359 |
358 PermissionsUpdater perms_updater(service_weak_->profile()); | 360 PermissionsUpdater perms_updater(service_weak_->profile()); |
359 perms_updater.InitializePermissions(extension()); | 361 perms_updater.InitializePermissions(extension()); |
360 perms_updater.GrantActivePermissions(extension()); | 362 perms_updater.GrantActivePermissions(extension()); |
361 | 363 |
362 service_weak_->OnExtensionInstalled( | 364 service_weak_->OnExtensionInstalled( |
363 extension(), syncer::StringOrdinal(), kInstallFlagInstallImmediately); | 365 extension(), syncer::StringOrdinal(), kInstallFlagInstallImmediately); |
364 } | 366 } |
365 | 367 |
366 } // namespace extensions | 368 } // namespace extensions |
OLD | NEW |