Chrome Performance Monitor: MetricDetails refactor.

chrome/browser/ui/webui/performance_monitor/web_ui_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/performance_monitor/web_ui_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/time.h"
 #include "base/values.h"
@@ skipping 41 matching lines @@
 }
 
 // Queries the performance monitor database for metrics of type |metric_type|
 // between |start| and |end| times and appends the results to |results|.
 void DoGetMetric(ListValue* results,
                  MetricType metric_type,
                  const base::Time& start, const base::Time& end,
                  const base::TimeDelta& resolution) {
   Database* db = PerformanceMonitor::GetInstance()->database();
   Database::MetricVectorMap metric_vector_map = db->GetStatsForMetricByActivity(
-      MetricTypeToString(metric_type), start, end);
+      metric_type, start, end);
 
   linked_ptr<Database::MetricInfoVector> metric_vector =
       metric_vector_map[kProcessChromeAggregate];
   if (!metric_vector.get())
     metric_vector.reset(new Database::MetricInfoVector());
 
   Database::MetricInfoVector aggregated_metrics =
       util::AggregateMetric(*metric_vector, start, resolution);
   for (Database::MetricInfoVector::iterator it = aggregated_metrics.begin();
        it != aggregated_metrics.end(); ++it) {
@@ skipping 94 matching lines @@
                  "performance_monitor.getEventsCallback",
                  base::Owned(results)));
 }
 
 void WebUIHandler::HandleGetAllMetricTypes(const ListValue* args) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   CHECK_EQ(0u, args->GetSize());
   ListValue results;
   for (int i = 0; i < METRIC_NUMBER_OF_METRICS; ++i) {
     MetricType metric_type = static_cast<MetricType>(i);
+    const MetricDetails* metric_details = GetMetricDetails(metric_type);
+
     DictionaryValue* metric_type_info = new DictionaryValue();
     metric_type_info->SetInteger("metricType", metric_type);
     metric_type_info->SetString("shortDescription",
-                                MetricTypeToString(metric_type));
+                                metric_details->description);
+    metric_type_info->SetDouble("maxValue", metric_details->max_value);
+    metric_type_info->SetString("units", metric_details->units);
     results.Append(metric_type_info);
   }
 
   ReturnResults("performance_monitor.getAllMetricTypesCallback", &results);
 }
 
 void WebUIHandler::HandleGetMetric(const ListValue* args) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   CHECK_EQ(4u, args->GetSize());
   double metric = 0;
@@ skipping 17 matching lines @@
   results->Set("points", points_results);
   util::PostTaskToDatabaseThreadAndReply(
       base::Bind(&DoGetMetric, points_results, metric_type,
                  start, end, resolution),
       base::Bind(&WebUIHandler::ReturnResults, AsWeakPtr(),
                  "performance_monitor.getMetricCallback",
                  base::Owned(results)));
 }
 
 }  // namespace performance_monitor