| 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 #include "extensions/common/permissions/permissions_data.h" | 56 #include "extensions/common/permissions/permissions_data.h" |
| 57 #include "extensions/common/user_script.h" | 57 #include "extensions/common/user_script.h" |
| 58 #include "grit/chromium_strings.h" | 58 #include "grit/chromium_strings.h" |
| 59 #include "grit/extensions_strings.h" | 59 #include "grit/extensions_strings.h" |
| 60 #include "grit/generated_resources.h" | 60 #include "grit/generated_resources.h" |
| 61 #include "grit/theme_resources.h" | 61 #include "grit/theme_resources.h" |
| 62 #include "third_party/skia/include/core/SkBitmap.h" | 62 #include "third_party/skia/include/core/SkBitmap.h" |
| 63 #include "ui/base/l10n/l10n_util.h" | 63 #include "ui/base/l10n/l10n_util.h" |
| 64 | 64 |
| 65 #if defined(OS_CHROMEOS) | 65 #if defined(OS_CHROMEOS) |
| 66 #include "chrome/browser/chromeos/login/users/user_manager.h" | 66 #include "components/user_manager/user_manager.h" |
| 67 #endif | 67 #endif |
| 68 | 68 |
| 69 using base::UserMetricsAction; | 69 using base::UserMetricsAction; |
| 70 using content::BrowserThread; | 70 using content::BrowserThread; |
| 71 using extensions::SharedModuleInfo; | 71 using extensions::SharedModuleInfo; |
| 72 | 72 |
| 73 namespace extensions { | 73 namespace extensions { |
| 74 | 74 |
| 75 namespace { | 75 namespace { |
| 76 | 76 |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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())) { |
| 575 bool in_kiosk_mode = false; | 575 bool in_kiosk_mode = false; |
| 576 #if defined(OS_CHROMEOS) | 576 #if defined(OS_CHROMEOS) |
| 577 chromeos::UserManager* user_manager = chromeos::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; |
| 585 } | 585 } |
| 586 } | 586 } |
| 587 | 587 |
| (...skipping 304 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 |