chrome/browser/profiles/profile_manager.cc - Issue 920963003: Moved scoped_histogram_timer to the main histogram_macros.h.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 920963003: Moved scoped_histogram_timer to the main histogram_macros.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove gyp entries for old unit test in media/ Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/metrics/histogram_macros_unittest.cc ('k') | content/browser/renderer_host/media/audio_input_device_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_manager.cc

diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc

index 08470f7c6475dd95747206f62946a9c91256a6b3..1db7320da7e4c608bbfd9ec51cfcaee4df815dee 100644

--- a/chrome/browser/profiles/profile_manager.cc

+++ b/chrome/browser/profiles/profile_manager.cc

@@ -12,7 +12,7 @@

#include "base/files/file_enumerator.h"

#include "base/files/file_path.h"

#include "base/files/file_util.h"

-#include "base/metrics/histogram.h"

+#include "base/metrics/histogram_macros.h"

#include "base/prefs/pref_service.h"

#include "base/prefs/scoped_user_pref_update.h"

#include "base/strings/string_number_conversions.h"

@@ -373,7 +373,9 @@ Profile* ProfileManager::GetActiveUserProfile() {

}

Profile* ProfileManager::GetProfile(const base::FilePath& profile_dir) {

- TRACE_EVENT0("browser", "ProfileManager::GetProfile")

+ TRACE_EVENT0("browser", "ProfileManager::GetProfile");

+ SCOPED_UMA_HISTOGRAM_TIMER("Profile.GetProfile");

// If the profile is already loaded (e.g., chrome.exe launched twice), just

// return it.

Profile* profile = GetProfileByPath(profile_dir);

« no previous file with comments | « base/metrics/histogram_macros_unittest.cc ('k') | content/browser/renderer_host/media/audio_input_device_manager.cc » ('j') | no next file with comments »