Merge monitor_reconfigure into powerd.

powerd.h

Index: powerd.h
diff --git a/powerd.h b/powerd.h
index ddac73e0b027012d32e4645a802d3895e6e05491..496c28f69d0ee413bcfd8cd06817adcf148b861f 100644
--- a/powerd.h
+++ b/powerd.h
@@ -29,6 +29,7 @@
 
 namespace power_manager {
 
+class MonitorReconfigure;
 class PowerButtonHandler;
 
 class Daemon : public XIdleMonitor {
@@ -36,6 +37,7 @@ class Daemon : public XIdleMonitor {
   Daemon(BacklightController* ctl, PowerPrefs* prefs,
          MetricsLibraryInterface* metrics_lib,
          VideoDetectorInterface* video_detector,
+         MonitorReconfigure* monitor_reconfigure,
          const FilePath& run_dir);
   ~Daemon();
 
@@ -222,6 +224,7 @@ class Daemon : public XIdleMonitor {
   MetricsLibraryInterface* metrics_lib_;
   VideoDetectorInterface* video_detector_;
   XIdle idle_;
+  MonitorReconfigure* monitor_reconfigure_;
   double low_battery_suspend_percent_;
   bool clean_shutdown_initiated_;
   bool low_battery_;