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/ui/webui/extensions/extension_settings_handler.h" | 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
6 | 6 |
7 #include "apps/app_load_service.h" | 7 #include "apps/app_load_service.h" |
8 #include "apps/saved_files_service.h" | 8 #include "apps/saved_files_service.h" |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/base64.h" | 10 #include "base/base64.h" |
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
843 extension_id_prompting_ = ""; | 843 extension_id_prompting_ = ""; |
844 | 844 |
845 // There will be no EXTENSION_UNLOADED notification for terminated | 845 // There will be no EXTENSION_UNLOADED notification for terminated |
846 // extensions as they were already unloaded. | 846 // extensions as they were already unloaded. |
847 if (was_terminated) | 847 if (was_terminated) |
848 HandleRequestExtensionsData(NULL); | 848 HandleRequestExtensionsData(NULL); |
849 } | 849 } |
850 | 850 |
851 void ExtensionSettingsHandler::ExtensionUninstallCanceled() { | 851 void ExtensionSettingsHandler::ExtensionUninstallCanceled() { |
852 extension_id_prompting_ = ""; | 852 extension_id_prompting_ = ""; |
| 853 web_ui()->CallJavascriptFunction("extensions.ExtensionList.uninstallCancel"); |
853 } | 854 } |
854 | 855 |
855 void ExtensionSettingsHandler::ExtensionWarningsChanged() { | 856 void ExtensionSettingsHandler::ExtensionWarningsChanged() { |
856 MaybeUpdateAfterNotification(); | 857 MaybeUpdateAfterNotification(); |
857 } | 858 } |
858 | 859 |
859 // This is called when the user clicks "Revoke File/Device Access." | 860 // This is called when the user clicks "Revoke File/Device Access." |
860 void ExtensionSettingsHandler::InstallUIProceed() { | 861 void ExtensionSettingsHandler::InstallUIProceed() { |
861 Profile* profile = Profile::FromWebUI(web_ui()); | 862 Profile* profile = Profile::FromWebUI(web_ui()); |
862 extensions::DevicePermissionsManager::Get(profile) | 863 extensions::DevicePermissionsManager::Get(profile) |
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1528 extension_service_->EnableExtension(extension_id); | 1529 extension_service_->EnableExtension(extension_id); |
1529 } else { | 1530 } else { |
1530 ExtensionErrorReporter::GetInstance()->ReportError( | 1531 ExtensionErrorReporter::GetInstance()->ReportError( |
1531 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), | 1532 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), |
1532 true); // Be noisy. | 1533 true); // Be noisy. |
1533 } | 1534 } |
1534 requirements_checker_.reset(); | 1535 requirements_checker_.reset(); |
1535 } | 1536 } |
1536 | 1537 |
1537 } // namespace extensions | 1538 } // namespace extensions |
OLD | NEW |