Index: chrome/app/chrome_main_delegate.cc |
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc |
index 5de4cc5257567257d916ae5ecab9a8c5388d70f3..8c965b0c270ba470eaad1a3bc80226643f46bbf6 100644 |
--- a/chrome/app/chrome_main_delegate.cc |
+++ b/chrome/app/chrome_main_delegate.cc |
@@ -26,6 +26,7 @@ |
#include "chrome/common/chrome_paths_internal.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/chrome_version_info.h" |
+#include "chrome/common/content_settings_pattern.h" |
#include "chrome/common/crash_keys.h" |
#include "chrome/common/logging_chrome.h" |
#include "chrome/common/profiling.h" |
@@ -38,6 +39,7 @@ |
#include "components/startup_metric_utils/startup_metric_utils.h" |
#include "content/public/common/content_client.h" |
#include "content/public/common/content_paths.h" |
+#include "extensions/common/constants.h" |
#include "ui/base/ui_base_switches.h" |
#if defined(OS_WIN) |
@@ -426,6 +428,9 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) { |
nacl::RegisterPathProvider(); |
#endif |
+ ContentSettingsPattern::SetNonWildcardDomainNonPortScheme( |
+ extensions::kExtensionScheme); |
+ |
// No support for ANDROID yet as DiagnosticsController needs wchar support. |
// TODO(gspencer): That's not true anymore, or at least there are no w-string |
// references anymore. Not sure if that means this can be enabled on Android or |