| 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 24 matching lines...) Expand all Loading... |
| 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_ui_util.h" |
| 40 #include "chrome/browser/extensions/extension_util.h" | 40 #include "chrome/browser/extensions/extension_util.h" |
| 41 #include "chrome/browser/extensions/extension_warning_set.h" | 41 #include "chrome/browser/extensions/extension_warning_set.h" |
| 42 #include "chrome/browser/extensions/install_verifier.h" | 42 #include "chrome/browser/extensions/install_verifier.h" |
| 43 #include "chrome/browser/extensions/updater/extension_updater.h" | 43 #include "chrome/browser/extensions/updater/extension_updater.h" |
| 44 #include "chrome/browser/profiles/profile.h" | 44 #include "chrome/browser/profiles/profile.h" |
| 45 #include "chrome/browser/supervised_user/supervised_user_service.h" | |
| 46 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | |
| 47 #include "chrome/browser/tab_contents/background_contents.h" | 45 #include "chrome/browser/tab_contents/background_contents.h" |
| 48 #include "chrome/browser/ui/browser_finder.h" | 46 #include "chrome/browser/ui/browser_finder.h" |
| 49 #include "chrome/browser/ui/extensions/application_launch.h" | 47 #include "chrome/browser/ui/extensions/application_launch.h" |
| 50 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" | 48 #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" |
| 51 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" | 49 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
| 52 #include "chrome/common/chrome_switches.h" | 50 #include "chrome/common/chrome_switches.h" |
| 53 #include "chrome/common/chrome_version_info.h" | 51 #include "chrome/common/chrome_version_info.h" |
| 54 #include "chrome/common/extensions/extension_constants.h" | 52 #include "chrome/common/extensions/extension_constants.h" |
| 55 #include "chrome/common/extensions/features/feature_channel.h" | 53 #include "chrome/common/extensions/features/feature_channel.h" |
| 56 #include "chrome/common/extensions/manifest_url_handler.h" | 54 #include "chrome/common/extensions/manifest_url_handler.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 85 #include "extensions/common/manifest_handlers/background_info.h" | 83 #include "extensions/common/manifest_handlers/background_info.h" |
| 86 #include "extensions/common/manifest_handlers/incognito_info.h" | 84 #include "extensions/common/manifest_handlers/incognito_info.h" |
| 87 #include "extensions/common/permissions/permissions_data.h" | 85 #include "extensions/common/permissions/permissions_data.h" |
| 88 #include "grit/browser_resources.h" | 86 #include "grit/browser_resources.h" |
| 89 #include "grit/chromium_strings.h" | 87 #include "grit/chromium_strings.h" |
| 90 #include "grit/generated_resources.h" | 88 #include "grit/generated_resources.h" |
| 91 #include "grit/theme_resources.h" | 89 #include "grit/theme_resources.h" |
| 92 #include "ui/base/l10n/l10n_util.h" | 90 #include "ui/base/l10n/l10n_util.h" |
| 93 #include "ui/base/resource/resource_bundle.h" | 91 #include "ui/base/resource/resource_bundle.h" |
| 94 | 92 |
| 93 #if defined(ENABLE_MANAGED_USERS) |
| 94 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 95 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
| 96 #endif |
| 97 |
| 95 using base::DictionaryValue; | 98 using base::DictionaryValue; |
| 96 using base::ListValue; | 99 using base::ListValue; |
| 97 using content::RenderViewHost; | 100 using content::RenderViewHost; |
| 98 using content::WebContents; | 101 using content::WebContents; |
| 99 | 102 |
| 100 namespace { | 103 namespace { |
| 101 const char kAppsDeveloperToolsExtensionId[] = | 104 const char kAppsDeveloperToolsExtensionId[] = |
| 102 "ohmmkhmmmpcnpikjeljgnaoabkaalbgc"; | 105 "ohmmkhmmmpcnpikjeljgnaoabkaalbgc"; |
| 103 } | 106 } |
| 104 | 107 |
| (...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1345 extension_service_->EnableExtension(extension_id); | 1348 extension_service_->EnableExtension(extension_id); |
| 1346 } else { | 1349 } else { |
| 1347 ExtensionErrorReporter::GetInstance()->ReportError( | 1350 ExtensionErrorReporter::GetInstance()->ReportError( |
| 1348 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), | 1351 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), |
| 1349 true); // Be noisy. | 1352 true); // Be noisy. |
| 1350 } | 1353 } |
| 1351 requirements_checker_.reset(); | 1354 requirements_checker_.reset(); |
| 1352 } | 1355 } |
| 1353 | 1356 |
| 1354 } // namespace extensions | 1357 } // namespace extensions |
| OLD | NEW |