| 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 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 301 Extension::Create(base::FilePath(), | 301 Extension::Create(base::FilePath(), |
| 302 install_source_, | 302 install_source_, |
| 303 *expected_manifest_->value(), | 303 *expected_manifest_->value(), |
| 304 creation_flags_, | 304 creation_flags_, |
| 305 &error); | 305 &error); |
| 306 if (error.empty()) { | 306 if (error.empty()) { |
| 307 scoped_refptr<const PermissionSet> expected_permissions = | 307 scoped_refptr<const PermissionSet> expected_permissions = |
| 308 dummy_extension->permissions_data()->active_permissions(); | 308 dummy_extension->permissions_data()->active_permissions(); |
| 309 valid = !(PermissionMessageProvider::Get()->IsPrivilegeIncrease( | 309 valid = !(PermissionMessageProvider::Get()->IsPrivilegeIncrease( |
| 310 expected_permissions.get(), | 310 expected_permissions.get(), |
| 311 extension->permissions_data()->active_permissions(), | 311 extension->permissions_data()->active_permissions().get(), |
| 312 extension->GetType())); | 312 extension->GetType())); |
| 313 } | 313 } |
| 314 } | 314 } |
| 315 } | 315 } |
| 316 | 316 |
| 317 if (!valid) | 317 if (!valid) |
| 318 return CrxInstallerError( | 318 return CrxInstallerError( |
| 319 l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID)); | 319 l10n_util::GetStringUTF16(IDS_EXTENSION_MANIFEST_INVALID)); |
| 320 } | 320 } |
| 321 | 321 |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 564 | 564 |
| 565 ConfirmInstall(); | 565 ConfirmInstall(); |
| 566 } | 566 } |
| 567 | 567 |
| 568 void CrxInstaller::ConfirmInstall() { | 568 void CrxInstaller::ConfirmInstall() { |
| 569 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 569 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 570 ExtensionService* service = service_weak_.get(); | 570 ExtensionService* service = service_weak_.get(); |
| 571 if (!service || service->browser_terminating()) | 571 if (!service || service->browser_terminating()) |
| 572 return; | 572 return; |
| 573 | 573 |
| 574 if (KioskModeInfo::IsKioskOnly(install_checker_.extension())) { | 574 if (KioskModeInfo::IsKioskOnly(install_checker_.extension().get())) { |
| 575 bool in_kiosk_mode = false; | 575 bool in_kiosk_mode = false; |
| 576 #if defined(OS_CHROMEOS) | 576 #if defined(OS_CHROMEOS) |
| 577 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); | 577 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); |
| 578 in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp(); | 578 in_kiosk_mode = user_manager && user_manager->IsLoggedInAsKioskApp(); |
| 579 #endif | 579 #endif |
| 580 if (!in_kiosk_mode) { | 580 if (!in_kiosk_mode) { |
| 581 ReportFailureFromUIThread(CrxInstallerError( | 581 ReportFailureFromUIThread(CrxInstallerError( |
| 582 l10n_util::GetStringUTF16( | 582 l10n_util::GetStringUTF16( |
| 583 IDS_EXTENSION_INSTALL_KIOSK_MODE_ONLY))); | 583 IDS_EXTENSION_INSTALL_KIOSK_MODE_ONLY))); |
| 584 return; | 584 return; |
| (...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 892 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) | 892 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) |
| 893 return; | 893 return; |
| 894 | 894 |
| 895 if (client_) { | 895 if (client_) { |
| 896 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). | 896 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). |
| 897 client_->ConfirmReEnable(this, extension()); | 897 client_->ConfirmReEnable(this, extension()); |
| 898 } | 898 } |
| 899 } | 899 } |
| 900 | 900 |
| 901 } // namespace extensions | 901 } // namespace extensions |
| OLD | NEW |