| 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/app_restore_service.h" | 8 #include "apps/app_restore_service.h" |
| 9 #include "apps/app_window.h" | 9 #include "apps/app_window.h" |
| 10 #include "apps/app_window_registry.h" | 10 #include "apps/app_window_registry.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 29 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
| 30 #include "chrome/browser/extensions/component_loader.h" | 30 #include "chrome/browser/extensions/component_loader.h" |
| 31 #include "chrome/browser/extensions/crx_installer.h" | 31 #include "chrome/browser/extensions/crx_installer.h" |
| 32 #include "chrome/browser/extensions/devtools_util.h" | 32 #include "chrome/browser/extensions/devtools_util.h" |
| 33 #include "chrome/browser/extensions/error_console/error_console.h" | 33 #include "chrome/browser/extensions/error_console/error_console.h" |
| 34 #include "chrome/browser/extensions/extension_action_manager.h" | 34 #include "chrome/browser/extensions/extension_action_manager.h" |
| 35 #include "chrome/browser/extensions/extension_disabled_ui.h" | 35 #include "chrome/browser/extensions/extension_disabled_ui.h" |
| 36 #include "chrome/browser/extensions/extension_error_reporter.h" | 36 #include "chrome/browser/extensions/extension_error_reporter.h" |
| 37 #include "chrome/browser/extensions/extension_service.h" | 37 #include "chrome/browser/extensions/extension_service.h" |
| 38 #include "chrome/browser/extensions/extension_tab_util.h" | 38 #include "chrome/browser/extensions/extension_tab_util.h" |
| 39 #include "chrome/browser/extensions/extension_ui_util.h" |
| 39 #include "chrome/browser/extensions/extension_util.h" | 40 #include "chrome/browser/extensions/extension_util.h" |
| 40 #include "chrome/browser/extensions/extension_warning_set.h" | 41 #include "chrome/browser/extensions/extension_warning_set.h" |
| 41 #include "chrome/browser/extensions/install_verifier.h" | 42 #include "chrome/browser/extensions/install_verifier.h" |
| 42 #include "chrome/browser/extensions/updater/extension_updater.h" | 43 #include "chrome/browser/extensions/updater/extension_updater.h" |
| 43 #include "chrome/browser/google/google_util.h" | 44 #include "chrome/browser/google/google_util.h" |
| 44 #include "chrome/browser/managed_mode/managed_user_service.h" | 45 #include "chrome/browser/managed_mode/managed_user_service.h" |
| 45 #include "chrome/browser/managed_mode/managed_user_service_factory.h" | 46 #include "chrome/browser/managed_mode/managed_user_service_factory.h" |
| 46 #include "chrome/browser/profiles/profile.h" | 47 #include "chrome/browser/profiles/profile.h" |
| 47 #include "chrome/browser/tab_contents/background_contents.h" | 48 #include "chrome/browser/tab_contents/background_contents.h" |
| 48 #include "chrome/browser/ui/browser_finder.h" | 49 #include "chrome/browser/ui/browser_finder.h" |
| (...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 732 // Add the extensions to the results structure. | 733 // Add the extensions to the results structure. |
| 733 base::ListValue* extensions_list = new base::ListValue(); | 734 base::ListValue* extensions_list = new base::ListValue(); |
| 734 | 735 |
| 735 ExtensionWarningService* warnings = | 736 ExtensionWarningService* warnings = |
| 736 ExtensionSystem::Get(profile)->warning_service(); | 737 ExtensionSystem::Get(profile)->warning_service(); |
| 737 | 738 |
| 738 ExtensionRegistry* registry = ExtensionRegistry::Get(profile); | 739 ExtensionRegistry* registry = ExtensionRegistry::Get(profile); |
| 739 const ExtensionSet& enabled_set = registry->enabled_extensions(); | 740 const ExtensionSet& enabled_set = registry->enabled_extensions(); |
| 740 for (ExtensionSet::const_iterator extension = enabled_set.begin(); | 741 for (ExtensionSet::const_iterator extension = enabled_set.begin(); |
| 741 extension != enabled_set.end(); ++extension) { | 742 extension != enabled_set.end(); ++extension) { |
| 742 if ((*extension)->ShouldDisplayInExtensionSettings()) { | 743 if (ui_util::ShouldDisplayInExtensionSettings(*extension, profile)) { |
| 743 extensions_list->Append(CreateExtensionDetailValue( | 744 extensions_list->Append(CreateExtensionDetailValue( |
| 744 extension->get(), | 745 extension->get(), |
| 745 GetInspectablePagesForExtension(extension->get(), true), | 746 GetInspectablePagesForExtension(extension->get(), true), |
| 746 warnings)); | 747 warnings)); |
| 747 } | 748 } |
| 748 } | 749 } |
| 749 const ExtensionSet& disabled_set = registry->disabled_extensions(); | 750 const ExtensionSet& disabled_set = registry->disabled_extensions(); |
| 750 for (ExtensionSet::const_iterator extension = disabled_set.begin(); | 751 for (ExtensionSet::const_iterator extension = disabled_set.begin(); |
| 751 extension != disabled_set.end(); ++extension) { | 752 extension != disabled_set.end(); ++extension) { |
| 752 if ((*extension)->ShouldDisplayInExtensionSettings()) { | 753 if (ui_util::ShouldDisplayInExtensionSettings(*extension, profile)) { |
| 753 extensions_list->Append(CreateExtensionDetailValue( | 754 extensions_list->Append(CreateExtensionDetailValue( |
| 754 extension->get(), | 755 extension->get(), |
| 755 GetInspectablePagesForExtension(extension->get(), false), | 756 GetInspectablePagesForExtension(extension->get(), false), |
| 756 warnings)); | 757 warnings)); |
| 757 } | 758 } |
| 758 } | 759 } |
| 759 const ExtensionSet& terminated_set = registry->terminated_extensions(); | 760 const ExtensionSet& terminated_set = registry->terminated_extensions(); |
| 760 std::vector<ExtensionPage> empty_pages; | 761 std::vector<ExtensionPage> empty_pages; |
| 761 for (ExtensionSet::const_iterator extension = terminated_set.begin(); | 762 for (ExtensionSet::const_iterator extension = terminated_set.begin(); |
| 762 extension != terminated_set.end(); ++extension) { | 763 extension != terminated_set.end(); ++extension) { |
| 763 if ((*extension)->ShouldDisplayInExtensionSettings()) { | 764 if (ui_util::ShouldDisplayInExtensionSettings(*extension, profile)) { |
| 764 extensions_list->Append(CreateExtensionDetailValue( | 765 extensions_list->Append(CreateExtensionDetailValue( |
| 765 extension->get(), | 766 extension->get(), |
| 766 empty_pages, // Terminated process has no active pages. | 767 empty_pages, // Terminated process has no active pages. |
| 767 warnings)); | 768 warnings)); |
| 768 } | 769 } |
| 769 } | 770 } |
| 770 results.Set("extensions", extensions_list); | 771 results.Set("extensions", extensions_list); |
| 771 | 772 |
| 772 bool is_managed = profile->IsManaged(); | 773 bool is_managed = profile->IsManaged(); |
| 773 bool developer_mode = | 774 bool developer_mode = |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 extension_service_->EnableExtension(extension_id); | 1285 extension_service_->EnableExtension(extension_id); |
| 1285 } else { | 1286 } else { |
| 1286 ExtensionErrorReporter::GetInstance()->ReportError( | 1287 ExtensionErrorReporter::GetInstance()->ReportError( |
| 1287 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), | 1288 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), |
| 1288 true); // Be noisy. | 1289 true); // Be noisy. |
| 1289 } | 1290 } |
| 1290 requirements_checker_.reset(); | 1291 requirements_checker_.reset(); |
| 1291 } | 1292 } |
| 1292 | 1293 |
| 1293 } // namespace extensions | 1294 } // namespace extensions |
| OLD | NEW |