Chromium Code Reviews| 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..bad25c074cb0fa065e81948db44298b12a4c7838 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,11 @@ 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 15:35:07
doesn't document_url == GURL(content::kSwappedOutU
Fady Samuel
2013/12/03 15:56:26
It does. Changed.
|
| + 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)) { |