Fix crash in WebsiteSettingsPopupView::OnWidgetClosing

chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 316 matching lines @@
                                          tab_contents->infobar_tab_helper(),
                                          url,
                                          ssl,
                                          content::CertStore::GetInstance()));
   }
 }
 
 void WebsiteSettingsPopupView::OnPermissionChanged(
     PermissionSelectorView* permission_selector) {
   DCHECK(permission_selector);
   presenter_->OnSitePermissionChanged(

[msw, 2012/08/07 20:13:45]

Perhaps comment that this won't be called (perms can't change) for an internal
chrome:// site?

[markusheintz_, 2012/08/07 20:28:05]

Done.

       permission_selector->GetPermissionType(),
       permission_selector->GetSelectedSetting());
 }
 
 gfx::Rect WebsiteSettingsPopupView::GetAnchorRect() {
   // Compensate for some built-in padding in the icon. This will make the arrow
   // point to the middle of the icon.
   gfx::Rect anchor(BubbleDelegateView::GetAnchorRect());
   anchor.Inset(0, anchor_view() ? kLocationIconBottomMargin : 0);
   return anchor;
 }
 
 void WebsiteSettingsPopupView::OnWidgetClosing(views::Widget* widget) {
-  presenter_->OnUIClosing();
+  if (presenter_.get())
+    presenter_->OnUIClosing();
 }
 
 void WebsiteSettingsPopupView::ButtonPressed(
     views::Button* button,
     const views::Event& event) {
   GetWidget()->Close();
 }
 
 void WebsiteSettingsPopupView::LinkClicked(views::Link* source,
                                            int event_flags) {
@@ skipping 333 matching lines @@
 
   if (link) {
     content_layout->StartRow(1, 0);
     content_layout->AddView(link);
   }
 
   layout->AddView(content_pane, 1, 1, views::GridLayout::LEADING,
                   views::GridLayout::LEADING);
   layout->AddPaddingRow(0, kConnectionSectionPaddingBottom);
 }