summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/message_pump_glib.cc4
-rw-r--r--base/message_pump_glib.h2
-rw-r--r--base/metrics/histogram.cc12
-rw-r--r--base/metrics/histogram.h6
-rw-r--r--base/values_util.cc4
-rw-r--r--base/values_util.h4
6 files changed, 25 insertions, 7 deletions
diff --git a/base/message_pump_glib.cc b/base/message_pump_glib.cc
index fa5b726..fd24285 100644
--- a/base/message_pump_glib.cc
+++ b/base/message_pump_glib.cc
@@ -315,6 +315,10 @@ void MessagePumpForUI::DidProcessEvent(GdkEvent* event) {
FOR_EACH_OBSERVER(Observer, observers_, DidProcessEvent(event));
}
+void MessagePumpForUI::Run(Delegate* delegate) {
+ RunWithDispatcher(delegate, NULL);
+}
+
void MessagePumpForUI::Quit() {
if (state_) {
state_->should_quit = true;
diff --git a/base/message_pump_glib.h b/base/message_pump_glib.h
index 06635de..c118155 100644
--- a/base/message_pump_glib.h
+++ b/base/message_pump_glib.h
@@ -62,7 +62,7 @@ class MessagePumpForUI : public MessagePump {
// is ready for processing.
virtual bool RunOnce(GMainContext* context, bool block);
- virtual void Run(Delegate* delegate) { RunWithDispatcher(delegate, NULL); }
+ virtual void Run(Delegate* delegate);
virtual void Quit();
virtual void ScheduleWork();
virtual void ScheduleDelayedWork(const TimeTicks& delayed_work_time);
diff --git a/base/metrics/histogram.cc b/base/metrics/histogram.cc
index 729e3b9..d87640f 100644
--- a/base/metrics/histogram.cc
+++ b/base/metrics/histogram.cc
@@ -571,6 +571,18 @@ Histogram::Inconsistencies Histogram::FindCorruption(
return static_cast<Inconsistencies>(inconsistencies);
}
+Histogram::ClassType Histogram::histogram_type() const {
+ return HISTOGRAM;
+}
+
+Histogram::Sample Histogram::ranges(size_t i) const {
+ return ranges_[i];
+}
+
+size_t Histogram::bucket_count() const {
+ return bucket_count_;
+}
+
//------------------------------------------------------------------------------
// Methods for the Histogram::SampleSet class
//------------------------------------------------------------------------------
diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
index b87c891..562f252 100644
--- a/base/metrics/histogram.h
+++ b/base/metrics/histogram.h
@@ -403,13 +403,13 @@ class Histogram : public base::RefCountedThreadSafe<Histogram> {
//----------------------------------------------------------------------------
// Accessors for factory constuction, serialization and testing.
//----------------------------------------------------------------------------
- virtual ClassType histogram_type() const { return HISTOGRAM; }
+ virtual ClassType histogram_type() const;
const std::string& histogram_name() const { return histogram_name_; }
Sample declared_min() const { return declared_min_; }
Sample declared_max() const { return declared_max_; }
- virtual Sample ranges(size_t i) const { return ranges_[i];}
+ virtual Sample ranges(size_t i) const;
Sample range_checksum() const { return range_checksum_; }
- virtual size_t bucket_count() const { return bucket_count_; }
+ virtual size_t bucket_count() const;
// Snapshot the current complete set of sample data.
// Override with atomic/locked snapshot if needed.
virtual void SnapshotSample(SampleSet* sample) const;
diff --git a/base/values_util.cc b/base/values_util.cc
index 31d8e8c..fbc616b 100644
--- a/base/values_util.cc
+++ b/base/values_util.cc
@@ -12,3 +12,7 @@ RefCountedList::~RefCountedList() {
if (list_)
delete list_;
}
+
+ListValue* RefCountedList::Get() {
+ return list_;
+}
diff --git a/base/values_util.h b/base/values_util.h
index 57b35c1..1626bb5 100644
--- a/base/values_util.h
+++ b/base/values_util.h
@@ -15,9 +15,7 @@ class RefCountedList : public base::RefCountedThreadSafe<RefCountedList> {
explicit RefCountedList(ListValue* list);
virtual ~RefCountedList();
- virtual ListValue* Get() {
- return list_;
- }
+ virtual ListValue* Get();
private:
ListValue* list_;