Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(83)

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 503033002: Move ExtensionWarningService and ExtensionsWarningSet to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@3_web_view_internal
Patch Set: rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 19 matching lines...) Expand all
30 #include "chrome/browser/extensions/crx_installer.h" 30 #include "chrome/browser/extensions/crx_installer.h"
31 #include "chrome/browser/extensions/devtools_util.h" 31 #include "chrome/browser/extensions/devtools_util.h"
32 #include "chrome/browser/extensions/error_console/error_console.h" 32 #include "chrome/browser/extensions/error_console/error_console.h"
33 #include "chrome/browser/extensions/extension_action_manager.h" 33 #include "chrome/browser/extensions/extension_action_manager.h"
34 #include "chrome/browser/extensions/extension_disabled_ui.h" 34 #include "chrome/browser/extensions/extension_disabled_ui.h"
35 #include "chrome/browser/extensions/extension_error_reporter.h" 35 #include "chrome/browser/extensions/extension_error_reporter.h"
36 #include "chrome/browser/extensions/extension_service.h" 36 #include "chrome/browser/extensions/extension_service.h"
37 #include "chrome/browser/extensions/extension_tab_util.h" 37 #include "chrome/browser/extensions/extension_tab_util.h"
38 #include "chrome/browser/extensions/extension_ui_util.h" 38 #include "chrome/browser/extensions/extension_ui_util.h"
39 #include "chrome/browser/extensions/extension_util.h" 39 #include "chrome/browser/extensions/extension_util.h"
40 #include "chrome/browser/extensions/extension_warning_set.h"
41 #include "chrome/browser/extensions/install_verifier.h" 40 #include "chrome/browser/extensions/install_verifier.h"
42 #include "chrome/browser/extensions/path_util.h" 41 #include "chrome/browser/extensions/path_util.h"
43 #include "chrome/browser/extensions/shared_module_service.h" 42 #include "chrome/browser/extensions/shared_module_service.h"
44 #include "chrome/browser/extensions/updater/extension_updater.h" 43 #include "chrome/browser/extensions/updater/extension_updater.h"
45 #include "chrome/browser/platform_util.h" 44 #include "chrome/browser/platform_util.h"
46 #include "chrome/browser/prefs/incognito_mode_prefs.h" 45 #include "chrome/browser/prefs/incognito_mode_prefs.h"
47 #include "chrome/browser/profiles/profile.h" 46 #include "chrome/browser/profiles/profile.h"
48 #include "chrome/browser/supervised_user/supervised_user_service.h" 47 #include "chrome/browser/supervised_user/supervised_user_service.h"
49 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 48 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
50 #include "chrome/browser/tab_contents/background_contents.h" 49 #include "chrome/browser/tab_contents/background_contents.h"
(...skipping 26 matching lines...) Expand all
77 #include "extensions/browser/blacklist_state.h" 76 #include "extensions/browser/blacklist_state.h"
78 #include "extensions/browser/extension_error.h" 77 #include "extensions/browser/extension_error.h"
79 #include "extensions/browser/extension_host.h" 78 #include "extensions/browser/extension_host.h"
80 #include "extensions/browser/extension_registry.h" 79 #include "extensions/browser/extension_registry.h"
81 #include "extensions/browser/extension_system.h" 80 #include "extensions/browser/extension_system.h"
82 #include "extensions/browser/lazy_background_task_queue.h" 81 #include "extensions/browser/lazy_background_task_queue.h"
83 #include "extensions/browser/management_policy.h" 82 #include "extensions/browser/management_policy.h"
84 #include "extensions/browser/pref_names.h" 83 #include "extensions/browser/pref_names.h"
85 #include "extensions/browser/uninstall_reason.h" 84 #include "extensions/browser/uninstall_reason.h"
86 #include "extensions/browser/view_type_utils.h" 85 #include "extensions/browser/view_type_utils.h"
86 #include "extensions/browser/warning_set.h"
87 #include "extensions/common/constants.h" 87 #include "extensions/common/constants.h"
88 #include "extensions/common/extension.h" 88 #include "extensions/common/extension.h"
89 #include "extensions/common/extension_icon_set.h" 89 #include "extensions/common/extension_icon_set.h"
90 #include "extensions/common/extension_set.h" 90 #include "extensions/common/extension_set.h"
91 #include "extensions/common/feature_switch.h" 91 #include "extensions/common/feature_switch.h"
92 #include "extensions/common/manifest.h" 92 #include "extensions/common/manifest.h"
93 #include "extensions/common/manifest_handlers/background_info.h" 93 #include "extensions/common/manifest_handlers/background_info.h"
94 #include "extensions/common/manifest_handlers/incognito_info.h" 94 #include "extensions/common/manifest_handlers/incognito_info.h"
95 #include "extensions/common/permissions/permissions_data.h" 95 #include "extensions/common/permissions/permissions_data.h"
96 #include "extensions/common/switches.h" 96 #include "extensions/common/switches.h"
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 203 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
204 registry->RegisterBooleanPref( 204 registry->RegisterBooleanPref(
205 prefs::kExtensionsUIDismissedADTPromo, 205 prefs::kExtensionsUIDismissedADTPromo,
206 false, 206 false,
207 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); 207 user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
208 } 208 }
209 209
210 base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue( 210 base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
211 const Extension* extension, 211 const Extension* extension,
212 const std::vector<ExtensionPage>& pages, 212 const std::vector<ExtensionPage>& pages,
213 const ExtensionWarningService* warning_service) { 213 const WarningService* warning_service) {
214 // The items which are to be written into app_dict are also described in 214 // The items which are to be written into app_dict are also described in
215 // chrome/browser/resources/extensions/extension_list.js in @typedef for 215 // chrome/browser/resources/extensions/extension_list.js in @typedef for
216 // ExtensionData. Please update it whenever you add or remove any keys here. 216 // ExtensionData. Please update it whenever you add or remove any keys here.
217 base::DictionaryValue* extension_data = new base::DictionaryValue(); 217 base::DictionaryValue* extension_data = new base::DictionaryValue();
218 bool enabled = extension_service_->IsExtensionEnabled(extension->id()); 218 bool enabled = extension_service_->IsExtensionEnabled(extension->id());
219 GetExtensionBasicInfo(extension, enabled, extension_data); 219 GetExtensionBasicInfo(extension, enabled, extension_data);
220 220
221 ExtensionPrefs* prefs = ExtensionPrefs::Get(extension_service_->profile()); 221 ExtensionPrefs* prefs = ExtensionPrefs::Get(extension_service_->profile());
222 int disable_reasons = prefs->GetDisableReasons(extension->id()); 222 int disable_reasons = prefs->GetDisableReasons(extension->id());
223 223
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 // chrome/browser/resources/extensions/extensions.js in @typedef for 822 // chrome/browser/resources/extensions/extensions.js in @typedef for
823 // ExtensionDataResponse. Please update it whenever you add or remove any keys 823 // ExtensionDataResponse. Please update it whenever you add or remove any keys
824 // here. 824 // here.
825 base::DictionaryValue results; 825 base::DictionaryValue results;
826 826
827 Profile* profile = Profile::FromWebUI(web_ui()); 827 Profile* profile = Profile::FromWebUI(web_ui());
828 828
829 // Add the extensions to the results structure. 829 // Add the extensions to the results structure.
830 base::ListValue* extensions_list = new base::ListValue(); 830 base::ListValue* extensions_list = new base::ListValue();
831 831
832 ExtensionWarningService* warnings = 832 WarningService* warnings = ExtensionSystem::Get(profile)->warning_service();
833 ExtensionSystem::Get(profile)->warning_service();
834 833
835 ExtensionRegistry* registry = ExtensionRegistry::Get(profile); 834 ExtensionRegistry* registry = ExtensionRegistry::Get(profile);
836 const ExtensionSet& enabled_set = registry->enabled_extensions(); 835 const ExtensionSet& enabled_set = registry->enabled_extensions();
837 for (ExtensionSet::const_iterator extension = enabled_set.begin(); 836 for (ExtensionSet::const_iterator extension = enabled_set.begin();
838 extension != enabled_set.end(); ++extension) { 837 extension != enabled_set.end(); ++extension) {
839 if (ui_util::ShouldDisplayInExtensionSettings(extension->get(), profile)) { 838 if (ui_util::ShouldDisplayInExtensionSettings(extension->get(), profile)) {
840 extensions_list->Append(CreateExtensionDetailValue( 839 extensions_list->Append(CreateExtensionDetailValue(
841 extension->get(), 840 extension->get(),
842 GetInspectablePagesForExtension(extension->get(), true), 841 GetInspectablePagesForExtension(extension->get(), true),
843 warnings)); 842 warnings));
(...skipping 571 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 extension_service_->EnableExtension(extension_id); 1414 extension_service_->EnableExtension(extension_id);
1416 } else { 1415 } else {
1417 ExtensionErrorReporter::GetInstance()->ReportError( 1416 ExtensionErrorReporter::GetInstance()->ReportError(
1418 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1417 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1419 true); // Be noisy. 1418 true); // Be noisy.
1420 } 1419 }
1421 requirements_checker_.reset(); 1420 requirements_checker_.reset();
1422 } 1421 }
1423 1422
1424 } // namespace extensions 1423 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698