diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 01:17:06 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 01:17:06 +0000 |
| commit | 859923ad0bcdcc8681e86beb7b3e22afeb70fd0c (patch) | |
| tree | 07e859be3781dbe625d7f873185fbb7b748735c0 /chrome/browser/content_settings | |
| parent | 5a4fee65b5e7669baa764781858fdee7b635cdf6 (diff) | |
| download | chromium_src-859923ad0bcdcc8681e86beb7b3e22afeb70fd0c.zip chromium_src-859923ad0bcdcc8681e86beb7b3e22afeb70fd0c.tar.gz chromium_src-859923ad0bcdcc8681e86beb7b3e22afeb70fd0c.tar.bz2 | |
Fix TabSpecificContentSettings::Get.
BUG=161858
TEST=as in bug
Review URL: https://codereview.chromium.org/11418187
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169809 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/tab_specific_content_settings.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 9cba89a..8374180 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -105,8 +105,11 @@ TabSpecificContentSettings* TabSpecificContentSettings::Get( if (!view) return NULL; - return TabSpecificContentSettings::FromWebContents( - WebContents::FromRenderViewHost(view)); + WebContents* web_contents = WebContents::FromRenderViewHost(view); + if (!web_contents) + return NULL; + + return TabSpecificContentSettings::FromWebContents(web_contents); } // static |