| Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
|
| diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
|
| index 35f98c29802d8e508f7191e649f402f74fbc55a6..cb8cefb948dc5a5cdafb3198b07e57974636d476 100644
|
| --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
|
| +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
|
| @@ -390,16 +390,21 @@ void WebsiteSettingsPopupView::LinkClicked(views::Link* source,
|
| int event_flags) {
|
| if (source == cookie_dialog_link_) {
|
| // Count how often the Collected Cookies dialog is opened.
|
| - content::RecordAction(
|
| - base::UserMetricsAction("WebsiteSettings_CookiesDialogOpened"));
|
| + presenter_->RecordWebsiteSettingsAction(
|
| + WebsiteSettings::WEBSITE_SETTINGS_COOKIES_DIALOG_OPENED);
|
| +
|
| new CollectedCookiesViews(web_contents_);
|
| } else if (source == certificate_dialog_link_) {
|
| gfx::NativeWindow parent = GetAnchorView() ?
|
| GetAnchorView()->GetWidget()->GetNativeWindow() : NULL;
|
| + presenter_->RecordWebsiteSettingsAction(
|
| + WebsiteSettings::WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED);
|
| ShowCertificateViewerByID(web_contents_, parent, cert_id_);
|
| } else if (source == signed_certificate_timestamps_link_) {
|
| chrome::ShowSignedCertificateTimestampsViewer(
|
| web_contents_, signed_certificate_timestamp_ids_);
|
| + presenter_->RecordWebsiteSettingsAction(
|
| + WebsiteSettings::WEBSITE_SETTINGS_TRANSPARENCY_VIEWER_OPENED);
|
| } else if (source == help_center_link_) {
|
| browser_->OpenURL(
|
| content::OpenURLParams(GURL(chrome::kPageInfoHelpCenterURL),
|
| @@ -407,10 +412,29 @@ void WebsiteSettingsPopupView::LinkClicked(views::Link* source,
|
| NEW_FOREGROUND_TAB,
|
| ui::PAGE_TRANSITION_LINK,
|
| false));
|
| + presenter_->RecordWebsiteSettingsAction(
|
| + WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_HELP_OPENED);
|
| }
|
| }
|
|
|
| void WebsiteSettingsPopupView::TabSelectedAt(int index) {
|
| + switch (index) {
|
| + case TAB_ID_PERMISSIONS:
|
| + presenter_->RecordWebsiteSettingsAction(
|
| + WebsiteSettings::WEBSITE_SETTINGS_PERMISSIONS_TAB_SELECTED);
|
| + break;
|
| + case TAB_ID_CONNECTION:
|
| + // If the Connection tab is selected first, we're still inside the
|
| + // construction of presenter_. In that case, the action is already logged
|
| + // by WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY.
|
| + if (presenter_) {
|
| + presenter_->RecordWebsiteSettingsAction(
|
| + WebsiteSettings::WEBSITE_SETTINGS_CONNECTION_TAB_SELECTED);
|
| + }
|
| + break;
|
| + default:
|
| + NOTREACHED();
|
| + }
|
| tabbed_pane_->GetSelectedTab()->Layout();
|
| SizeToContents();
|
| }
|
|
|