diff options
author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 18:41:15 +0000 |
---|---|---|
committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 18:41:15 +0000 |
commit | 92c79d30b2d16cadd448c7cfd702f3ebd4e10bf5 (patch) | |
tree | 07ae765fb06593881920926459c339830d2fb339 /chrome_frame/chrome_frame_activex.cc | |
parent | 1baff834aaaadbcc16c340542da9dd0c8c1ad724 (diff) | |
download | chromium_src-92c79d30b2d16cadd448c7cfd702f3ebd4e10bf5.zip chromium_src-92c79d30b2d16cadd448c7cfd702f3ebd4e10bf5.tar.gz chromium_src-92c79d30b2d16cadd448c7cfd702f3ebd4e10bf5.tar.bz2 |
Remove locked histogram macros since jar@chromium.org made the base macros threadsafe in http://crrev.com/80412.
BUG=none
TEST=metrics should work as before
Review URL: http://codereview.chromium.org/6800008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex.cc')
-rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index f86eba3..eb1eb79 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -303,8 +303,7 @@ void ChromeFrameActivex::OnAutomationServerLaunchFailed( if (reason == AUTOMATION_VERSION_MISMATCH && ShouldShowVersionMismatchDialog(is_privileged(), m_spClientSite)) { - THREAD_SAFE_UMA_HISTOGRAM_COUNTS( - "ChromeFrame.VersionMismatchDisplayed", 1); + UMA_HISTOGRAM_COUNTS("ChromeFrame.VersionMismatchDisplayed", 1); DisplayVersionMismatchWarning(m_hWnd, server_version); } } @@ -490,7 +489,7 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite( } // Log a metric that Chrome Frame is being used in Widget mode - THREAD_SAFE_UMA_LAUNCH_TYPE_COUNT(RENDERER_TYPE_CHROME_WIDGET); + UMA_LAUNCH_TYPE_COUNT(RENDERER_TYPE_CHROME_WIDGET); } return hr; |