Index: chrome/renderer/content_settings_observer.cc |
diff --git a/chrome/renderer/content_settings_observer.cc b/chrome/renderer/content_settings_observer.cc |
index 4f0a4b253f05bdcb0d57d30bdfa061cb403af105..1cc49d45e864878b2d79d2fe409ef1b82ae5fed8 100644 |
--- a/chrome/renderer/content_settings_observer.cc |
+++ b/chrome/renderer/content_settings_observer.cc |
@@ -61,7 +61,6 @@ ContentSetting GetContentSettingFromRules( |
return it->setting; |
} |
} |
- NOTREACHED(); |
return CONTENT_SETTING_DEFAULT; |
} |
@@ -365,6 +364,12 @@ bool ContentSettingsObserver::IsWhitelistedForContentSettings( |
if (EqualsASCII(origin.protocol(), chrome::kChromeInternalScheme)) |
return true; |
+ // TODO(creis, fsamuel): Remove this once the concept of swapped out |
+ // RenderViews goes away. |
+ if (EqualsASCII(origin.protocol(), GURL(content::kSwappedOutURL).scheme())) { |
jochen (gone - plz use gerrit)
2013/12/03 08:55:21
nit. no { }
Fady Samuel
2013/12/03 15:31:27
Done.
|
+ return true; |
+ } |
+ |
// If the scheme is file:, an empty file name indicates a directory listing, |
// which requires JavaScript to function properly. |
if (EqualsASCII(origin.protocol(), chrome::kFileScheme)) { |