| 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_window.h" | 8 #include "apps/app_window.h" |
| 9 #include "apps/app_window_registry.h" | 9 #include "apps/app_window_registry.h" |
| 10 #include "apps/saved_files_service.h" | 10 #include "apps/saved_files_service.h" |
| (...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 // Add the extensions to the results structure. | 822 // Add the extensions to the results structure. |
| 823 base::ListValue* extensions_list = new base::ListValue(); | 823 base::ListValue* extensions_list = new base::ListValue(); |
| 824 | 824 |
| 825 ExtensionWarningService* warnings = | 825 ExtensionWarningService* warnings = |
| 826 ExtensionSystem::Get(profile)->warning_service(); | 826 ExtensionSystem::Get(profile)->warning_service(); |
| 827 | 827 |
| 828 ExtensionRegistry* registry = ExtensionRegistry::Get(profile); | 828 ExtensionRegistry* registry = ExtensionRegistry::Get(profile); |
| 829 const ExtensionSet& enabled_set = registry->enabled_extensions(); | 829 const ExtensionSet& enabled_set = registry->enabled_extensions(); |
| 830 for (ExtensionSet::const_iterator extension = enabled_set.begin(); | 830 for (ExtensionSet::const_iterator extension = enabled_set.begin(); |
| 831 extension != enabled_set.end(); ++extension) { | 831 extension != enabled_set.end(); ++extension) { |
| 832 if (ui_util::ShouldDisplayInExtensionSettings(*extension, profile)) { | 832 if (ui_util::ShouldDisplayInExtensionSettings(extension->get(), profile)) { |
| 833 extensions_list->Append(CreateExtensionDetailValue( | 833 extensions_list->Append(CreateExtensionDetailValue( |
| 834 extension->get(), | 834 extension->get(), |
| 835 GetInspectablePagesForExtension(extension->get(), true), | 835 GetInspectablePagesForExtension(extension->get(), true), |
| 836 warnings)); | 836 warnings)); |
| 837 } | 837 } |
| 838 } | 838 } |
| 839 const ExtensionSet& disabled_set = registry->disabled_extensions(); | 839 const ExtensionSet& disabled_set = registry->disabled_extensions(); |
| 840 for (ExtensionSet::const_iterator extension = disabled_set.begin(); | 840 for (ExtensionSet::const_iterator extension = disabled_set.begin(); |
| 841 extension != disabled_set.end(); ++extension) { | 841 extension != disabled_set.end(); ++extension) { |
| 842 if (ui_util::ShouldDisplayInExtensionSettings(*extension, profile)) { | 842 if (ui_util::ShouldDisplayInExtensionSettings(extension->get(), profile)) { |
| 843 extensions_list->Append(CreateExtensionDetailValue( | 843 extensions_list->Append(CreateExtensionDetailValue( |
| 844 extension->get(), | 844 extension->get(), |
| 845 GetInspectablePagesForExtension(extension->get(), false), | 845 GetInspectablePagesForExtension(extension->get(), false), |
| 846 warnings)); | 846 warnings)); |
| 847 } | 847 } |
| 848 } | 848 } |
| 849 const ExtensionSet& terminated_set = registry->terminated_extensions(); | 849 const ExtensionSet& terminated_set = registry->terminated_extensions(); |
| 850 std::vector<ExtensionPage> empty_pages; | 850 std::vector<ExtensionPage> empty_pages; |
| 851 for (ExtensionSet::const_iterator extension = terminated_set.begin(); | 851 for (ExtensionSet::const_iterator extension = terminated_set.begin(); |
| 852 extension != terminated_set.end(); ++extension) { | 852 extension != terminated_set.end(); ++extension) { |
| 853 if (ui_util::ShouldDisplayInExtensionSettings(*extension, profile)) { | 853 if (ui_util::ShouldDisplayInExtensionSettings(extension->get(), profile)) { |
| 854 extensions_list->Append(CreateExtensionDetailValue( | 854 extensions_list->Append(CreateExtensionDetailValue( |
| 855 extension->get(), | 855 extension->get(), |
| 856 empty_pages, // Terminated process has no active pages. | 856 empty_pages, // Terminated process has no active pages. |
| 857 warnings)); | 857 warnings)); |
| 858 } | 858 } |
| 859 } | 859 } |
| 860 results.Set("extensions", extensions_list); | 860 results.Set("extensions", extensions_list); |
| 861 | 861 |
| 862 bool is_supervised = profile->IsSupervised(); | 862 bool is_supervised = profile->IsSupervised(); |
| 863 bool incognito_available = | 863 bool incognito_available = |
| (...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1408 extension_service_->EnableExtension(extension_id); | 1408 extension_service_->EnableExtension(extension_id); |
| 1409 } else { | 1409 } else { |
| 1410 ExtensionErrorReporter::GetInstance()->ReportError( | 1410 ExtensionErrorReporter::GetInstance()->ReportError( |
| 1411 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), | 1411 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), |
| 1412 true); // Be noisy. | 1412 true); // Be noisy. |
| 1413 } | 1413 } |
| 1414 requirements_checker_.reset(); | 1414 requirements_checker_.reset(); |
| 1415 } | 1415 } |
| 1416 | 1416 |
| 1417 } // namespace extensions | 1417 } // namespace extensions |
| OLD | NEW |