| Index: chrome/browser/ui/views/location_bar/location_icon_view.cc
|
| diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
|
| index 92e6e2d519736d6972b049c208360dd28bb6a195..d388e2fa9b8f2eb769d3cfd2b20393d15a02ba67 100644
|
| --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
|
| +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
|
|
|
| -#include "chrome/browser/ssl/security_state_tab_helper.h"
|
| #include "chrome/browser/ui/view_ids.h"
|
| #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
|
| #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
|
| @@ -12,14 +11,10 @@
|
| #include "chrome/grit/theme_resources.h"
|
| #include "components/grit/components_scaled_resources.h"
|
| #include "components/omnibox/browser/omnibox_edit_model.h"
|
| -#include "components/security_state/core/security_state.h"
|
| -#include "content/public/browser/navigation_controller.h"
|
| -#include "content/public/browser/navigation_entry.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/views/controls/label.h"
|
|
|
| -using content::NavigationEntry;
|
| using content::WebContents;
|
|
|
| LocationIconView::LocationIconView(const gfx::FontList& font_list,
|
| @@ -106,21 +101,7 @@ bool LocationIconView::OnActivate(const ui::Event& event) {
|
| WebContents* contents = location_bar_->GetWebContents();
|
| if (!contents)
|
| return false;
|
| -
|
| - // Important to use GetVisibleEntry to match what's showing in the omnibox.
|
| - NavigationEntry* entry = contents->GetController().GetVisibleEntry();
|
| - // The visible entry can be nullptr in the case of window.open("").
|
| - if (!entry)
|
| - return false;
|
| -
|
| - SecurityStateTabHelper* helper =
|
| - SecurityStateTabHelper::FromWebContents(contents);
|
| - DCHECK(helper);
|
| - security_state::SecurityInfo security_info;
|
| - helper->GetSecurityInfo(&security_info);
|
| -
|
| - location_bar_->delegate()->ShowWebsiteSettings(
|
| - contents, entry->GetVirtualURL(), security_info);
|
| + location_bar_->delegate()->ShowWebsiteSettings(contents);
|
| return true;
|
| }
|
|
|
|
|