Merge monitor_reconfigure into powerd.

powerd.h

Index: powerd.h
diff --git a/powerd.h b/powerd.h
index 482880cddcb141adf6a4b2ea1f68f56ecff02567..b345aa626f06c82e89f52bd53070361c3bb461b6 100644
--- a/powerd.h
+++ b/powerd.h
@@ -29,6 +29,7 @@
 
 namespace power_manager {
 
+class MonitorReconfigureMain;
 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,
+         MonitorReconfigureMain* monitor_reconfigure,
          const FilePath& run_dir);
   ~Daemon();
 
@@ -231,6 +233,7 @@ class Daemon : public XIdleMonitor {
   MetricsLibraryInterface* metrics_lib_;
   VideoDetectorInterface* video_detector_;
   XIdle idle_;
+  MonitorReconfigureMain* monitor_reconfigure_;
   double low_battery_suspend_percent_;
   bool clean_shutdown_initiated_;
   bool low_battery_;