Merge monitor_reconfigure into powerd.

powerd.h

Index: powerd.h
diff --git a/powerd.h b/powerd.h
index 482880cddcb141adf6a4b2ea1f68f56ecff02567..6052b49999eba62e094340d0f20c5d1d461f51fd 100644
--- a/powerd.h
+++ b/powerd.h
@@ -20,6 +20,7 @@
 #include "power_manager/backlight_controller.h"
 #include "power_manager/file_tagger.h"
 #include "power_manager/inotify.h"
+#include "power_manager/monitor_reconfigure.h"

[tfarina, 2011/04/14 02:36:05]

please, could you forward declare this instead?

[marcheu, 2011/04/14 02:52:10]

Done.

 #include "power_manager/power_prefs.h"
 #include "power_manager/screen_locker.h"
 #include "power_manager/suspender.h"
@@ -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_;