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

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

Issue 500043003: Add PolicyProvider to ExtensionManagement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext-1
Patch Set: fixes to #5 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/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 13 matching lines...) Expand all
24 #include "chrome/browser/chrome_notification_types.h" 24 #include "chrome/browser/chrome_notification_types.h"
25 #include "chrome/browser/devtools/devtools_window.h" 25 #include "chrome/browser/devtools/devtools_window.h"
26 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 26 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
27 #include "chrome/browser/extensions/component_loader.h" 27 #include "chrome/browser/extensions/component_loader.h"
28 #include "chrome/browser/extensions/crx_installer.h" 28 #include "chrome/browser/extensions/crx_installer.h"
29 #include "chrome/browser/extensions/devtools_util.h" 29 #include "chrome/browser/extensions/devtools_util.h"
30 #include "chrome/browser/extensions/error_console/error_console.h" 30 #include "chrome/browser/extensions/error_console/error_console.h"
31 #include "chrome/browser/extensions/extension_action_manager.h" 31 #include "chrome/browser/extensions/extension_action_manager.h"
32 #include "chrome/browser/extensions/extension_disabled_ui.h" 32 #include "chrome/browser/extensions/extension_disabled_ui.h"
33 #include "chrome/browser/extensions/extension_error_reporter.h" 33 #include "chrome/browser/extensions/extension_error_reporter.h"
34 #include "chrome/browser/extensions/extension_management.h"
34 #include "chrome/browser/extensions/extension_service.h" 35 #include "chrome/browser/extensions/extension_service.h"
35 #include "chrome/browser/extensions/extension_tab_util.h" 36 #include "chrome/browser/extensions/extension_tab_util.h"
36 #include "chrome/browser/extensions/extension_ui_util.h" 37 #include "chrome/browser/extensions/extension_ui_util.h"
37 #include "chrome/browser/extensions/extension_util.h" 38 #include "chrome/browser/extensions/extension_util.h"
38 #include "chrome/browser/extensions/install_verifier.h" 39 #include "chrome/browser/extensions/install_verifier.h"
39 #include "chrome/browser/extensions/path_util.h" 40 #include "chrome/browser/extensions/path_util.h"
40 #include "chrome/browser/extensions/shared_module_service.h" 41 #include "chrome/browser/extensions/shared_module_service.h"
41 #include "chrome/browser/extensions/updater/extension_updater.h" 42 #include "chrome/browser/extensions/updater/extension_updater.h"
42 #include "chrome/browser/platform_util.h" 43 #include "chrome/browser/platform_util.h"
43 #include "chrome/browser/prefs/incognito_mode_prefs.h" 44 #include "chrome/browser/prefs/incognito_mode_prefs.h"
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 // installed and the user has not previously dismissed the warning. 880 // installed and the user has not previously dismissed the warning.
880 bool promote_apps_dev_tools = false; 881 bool promote_apps_dev_tools = false;
881 if (!ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))-> 882 if (!ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->
882 GetExtensionById(kAppsDeveloperToolsExtensionId, 883 GetExtensionById(kAppsDeveloperToolsExtensionId,
883 ExtensionRegistry::EVERYTHING) && 884 ExtensionRegistry::EVERYTHING) &&
884 !profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDismissedADTPromo)) { 885 !profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDismissedADTPromo)) {
885 promote_apps_dev_tools = true; 886 promote_apps_dev_tools = true;
886 } 887 }
887 results.SetBoolean("promoteAppsDevTools", promote_apps_dev_tools); 888 results.SetBoolean("promoteAppsDevTools", promote_apps_dev_tools);
888 889
889 bool load_unpacked_disabled = 890 const bool load_unpacked_disabled =
890 ExtensionPrefs::Get(profile)->ExtensionsBlacklistedByDefault(); 891 ExtensionManagementFactory::GetForBrowserContext(profile)
892 ->BlacklistedByDefault();
891 results.SetBoolean("loadUnpackedDisabled", load_unpacked_disabled); 893 results.SetBoolean("loadUnpackedDisabled", load_unpacked_disabled);
892 894
893 results.SetBoolean( 895 results.SetBoolean(
894 "enableEmbeddedExtensionOptions", 896 "enableEmbeddedExtensionOptions",
895 extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()); 897 extensions::FeatureSwitch::embedded_extension_options()->IsEnabled());
896 898
897 web_ui()->CallJavascriptFunction( 899 web_ui()->CallJavascriptFunction(
898 "extensions.ExtensionSettings.returnExtensionsData", results); 900 "extensions.ExtensionSettings.returnExtensionsData", results);
899 901
900 MaybeRegisterForNotifications(); 902 MaybeRegisterForNotifications();
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
1413 extension_service_->EnableExtension(extension_id); 1415 extension_service_->EnableExtension(extension_id);
1414 } else { 1416 } else {
1415 ExtensionErrorReporter::GetInstance()->ReportError( 1417 ExtensionErrorReporter::GetInstance()->ReportError(
1416 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1418 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1417 true); // Be noisy. 1419 true); // Be noisy.
1418 } 1420 }
1419 requirements_checker_.reset(); 1421 requirements_checker_.reset();
1420 } 1422 }
1421 1423
1422 } // namespace extensions 1424 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698