Merge monitor_reconfigure into powerd.

powerd.h

 // Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef POWER_DAEMON_H_
 #define POWER_DAEMON_H_
 
 #include <dbus/dbus-glib-lowlevel.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
 #include <string>
 
 #include <ctime>
 
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "cros/chromeos_power.h"
 #include "metrics/metrics_library.h"
 #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"
 #include "power_manager/video_detector.h"
 #include "power_manager/xidle.h"
 #include "power_manager/xidle_monitor.h"
 
 namespace power_manager {
 
 class PowerButtonHandler;
 
 class Daemon : public XIdleMonitor {
  public:
   Daemon(BacklightController* ctl, PowerPrefs* prefs,
          MetricsLibraryInterface* metrics_lib,
          VideoDetectorInterface* video_detector,
+         MonitorReconfigureMain* monitor_reconfigure,
          const FilePath& run_dir);
   ~Daemon();
 
   ScreenLocker* locker() { return &locker_; }
   BacklightController* backlight_controller() { return backlight_controller_; }
 
   const std::string& current_user() const { return current_user_; }
 
   void Init();
   void Run();
@@ skipping 175 matching lines @@
                                     int max);
 
   // Called by dbus handler when resume signal is received
   void HandleResume();
 
   BacklightController* backlight_controller_;
   PowerPrefs* prefs_;
   MetricsLibraryInterface* metrics_lib_;
   VideoDetectorInterface* video_detector_;
   XIdle idle_;
+  MonitorReconfigureMain* monitor_reconfigure_;
   double low_battery_suspend_percent_;
   bool clean_shutdown_initiated_;
   bool low_battery_;
   int64 clean_shutdown_timeout_ms_;
   int64 plugged_dim_ms_;
   int64 plugged_off_ms_;
   int64 plugged_suspend_ms_;
   int64 unplugged_dim_ms_;
   int64 unplugged_off_ms_;
   int64 unplugged_suspend_ms_;
@@ skipping 40 matching lines @@
   KeyCode key_f7_;
 
   // User whose session is currently active, or empty if no session is
   // active or we're in guest mode.
   std::string current_user_;
 };
 
 }  // namespace power_manager
 
 #endif  // POWER_DAEMON_H_