summaryrefslogtreecommitdiffstats
path: root/chrome/browser/metrics
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 22:17:52 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 22:17:52 +0000
commit3ffd3aec671a91b110860fc7c956f4d11a5be680 (patch)
tree86a10bb6606e41091095d9ec15b4ef607ec624ed /chrome/browser/metrics
parent000527504bd13181abdb70119269f3da13de32a4 (diff)
downloadchromium_src-3ffd3aec671a91b110860fc7c956f4d11a5be680.zip
chromium_src-3ffd3aec671a91b110860fc7c956f4d11a5be680.tar.gz
chromium_src-3ffd3aec671a91b110860fc7c956f4d11a5be680.tar.bz2
Remove a confusing obsolete comment from MetricsService's header
This comment stopped being true almost two and a half years ago (the function doesn't even *have* a return value any more), but was never removed. Also fixes incorrect use of "setup" as a verb, to make the interface more readable. BUG=None TEST=None Review URL: http://codereview.chromium.org/6712011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78616 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics')
-rw-r--r--chrome/browser/metrics/metrics_service.cc4
-rw-r--r--chrome/browser/metrics/metrics_service.h11
-rw-r--r--chrome/browser/metrics/thread_watcher.cc2
3 files changed, 5 insertions, 12 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index f490bd5..1573acc 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -504,7 +504,7 @@ void MetricsService::SetRecording(bool enabled) {
child_process_logging::SetClientId(client_id_);
StartRecording();
- SetupNotifications(&registrar_, this);
+ SetUpNotifications(&registrar_, this);
} else {
registrar_.RemoveAll();
PushPendingLogsToUnsentLists();
@@ -534,7 +534,7 @@ bool MetricsService::reporting_active() const {
}
// static
-void MetricsService::SetupNotifications(NotificationRegistrar* registrar,
+void MetricsService::SetUpNotifications(NotificationRegistrar* registrar,
NotificationObserver* observer) {
registrar->Add(observer, NotificationType::BROWSER_OPENED,
NotificationService::AllSources());
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 14df39c..0fac931 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -95,10 +95,10 @@ class MetricsService : public NotificationObserver,
// types we'll be using.
static void RegisterPrefs(PrefService* local_state);
- // Setup notifications which indicate that a user is performing work. This is
+ // Set up notifications which indicate that a user is performing work. This is
// useful to allow some features to sleep, until the machine becomes active,
// such as precluding UMA uploads unless there was recent activity.
- static void SetupNotifications(NotificationRegistrar* registrar,
+ static void SetUpNotifications(NotificationRegistrar* registrar,
NotificationObserver* observer);
// Implementation of NotificationObserver
@@ -177,13 +177,6 @@ class MetricsService : public NotificationObserver,
void SetRecording(bool enabled);
// Enable/disable transmission of accumulated logs and crash reports (dumps).
- // Return value "true" indicates setting was definitively set as requested).
- // Return value of "false" indicates that the enable state is effectively
- // stuck in the other logical setting.
- // Google Update maintains the authoritative preference in the registry, so
- // the caller *might* not be able to actually change the setting.
- // It is always possible to set this to at least one value, which matches the
- // current value reported by querying Google Update.
void SetReporting(bool enabled);
// If in_idle is true, sets idle_since_last_transmission to true.
diff --git a/chrome/browser/metrics/thread_watcher.cc b/chrome/browser/metrics/thread_watcher.cc
index b389ae7..dcad2bd 100644
--- a/chrome/browser/metrics/thread_watcher.cc
+++ b/chrome/browser/metrics/thread_watcher.cc
@@ -197,7 +197,7 @@ ThreadWatcherList::ThreadWatcherList()
CHECK(!global_);
global_ = this;
// Register Notifications observer.
- MetricsService::SetupNotifications(&registrar_, this);
+ MetricsService::SetUpNotifications(&registrar_, this);
}
ThreadWatcherList::~ThreadWatcherList() {