From ad55ff19fdc8f17038c8e12dfc7f2d0ea9993f26 Mon Sep 17 00:00:00 2001 From: Frank Yan Date: Mon, 13 Feb 2012 14:38:37 -0800 Subject: [PATCH] Back out patch for bug 704538 because it's no longer needed. a=gavin --- browser/base/content/browser.js | 19 ------------------- .../telemetry/TelemetryHistograms.h | 1 - 2 files changed, 20 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index f3148e85ab2..035f6e93df0 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -3545,29 +3545,10 @@ const BrowserSearch = { if (!submission) return; - let newTab; - function newTabHandler(event) { - newTab = event.target; - } - gBrowser.tabContainer.addEventListener("TabOpen", newTabHandler); - openLinkIn(submission.uri.spec, useNewTab ? "tab" : "current", { postData: submission.postData, relatedToCurrent: true }); - - gBrowser.tabContainer.removeEventListener("TabOpen", newTabHandler); - if (newTab && !newTab.selected) { - let tabSelected = false; - function tabSelectHandler() { - tabSelected = true; - } - newTab.addEventListener("TabSelect", tabSelectHandler); - setTimeout(function () { - newTab.removeEventListener("TabSelect", tabSelectHandler); - Services.telemetry.getHistogramById("FX_CONTEXT_SEARCH_AND_TAB_SELECT").add(tabSelected); - }, 5000); - } }, /** diff --git a/toolkit/components/telemetry/TelemetryHistograms.h b/toolkit/components/telemetry/TelemetryHistograms.h index 53e3eb7cda0..caf12116d5d 100644 --- a/toolkit/components/telemetry/TelemetryHistograms.h +++ b/toolkit/components/telemetry/TelemetryHistograms.h @@ -322,7 +322,6 @@ HISTOGRAM(THUNDERBIRD_INDEXING_RATE_MSG_PER_S, 1, 100, 20, LINEAR, "Gloda: index // #ifdef MOZ_PHOENIX HISTOGRAM(FX_TAB_ANIM_OPEN_MS, 1, 3000, 10, EXPONENTIAL, "Firefox: Time taken by the tab opening animation in milliseconds") HISTOGRAM(FX_TAB_ANIM_CLOSE_MS, 1, 3000, 10, EXPONENTIAL, "Firefox: Time taken by the tab closing animation in milliseconds") -HISTOGRAM_BOOLEAN(FX_CONTEXT_SEARCH_AND_TAB_SELECT, "Firefox: Background tab was selected within 5 seconds of searching from the context menu") HISTOGRAM_BOOLEAN(FX_KEYWORD_URL_USERSET, "Firefox: keyword.URL has a user-set value") HISTOGRAM(FX_IDENTITY_POPUP_OPEN_MS, 1, 1000, 10, EXPONENTIAL, "Firefox: Time taken by the identity popup to open in milliseconds") HISTOGRAM(FX_APP_MENU_OPEN_MS, 1, 1000, 10, EXPONENTIAL, "Firefox: Time taken by the app-menu opening in milliseconds")