Merge monitor_reconfigure into powerd.

powerd.cc

 // 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.
 
 #include "power_manager/powerd.h"
 
 #include <gdk/gdkx.h>
 #include <stdint.h>
 #include <X11/extensions/dpms.h>
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h>
 #include <sys/inotify.h>
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chromeos/dbus/dbus.h"
 #include "chromeos/dbus/service_constants.h"
 #include "cros/chromeos_wm_ipc_enums.h"
+#include "power_manager/monitor_reconfigure.h"
 #include "power_manager/power_button_handler.h"
 #include "power_manager/power_constants.h"
 #include "power_manager/util.h"
 
 using std::max;
 using std::min;
 using std::string;
 using std::vector;
 
 namespace power_manager {
 
 // The minimum delta between timers to avoid timer precision issues
 static const int64 kFuzzMS = 100;
 
 // The minimum delta between timers when we want to give a user time to react
 static const int64 kReactMS = 30000;
 
 static const char kTaggedFilePath[] = "/var/lib/power_manager";
 
 // Daemon: Main power manager. Adjusts device status based on whether the
 //         user is idle and on video activity indicator from the window manager.
 //         This daemon is responsible for dimming of the backlight, turning
 //         the screen off, and suspending to RAM. The daemon also has the
 //         capability of shutting the system down.
 
 Daemon::Daemon(BacklightController* backlight_controller,
                PowerPrefs* prefs,
                MetricsLibraryInterface* metrics_lib,
                VideoDetectorInterface* video_detector,
+               MonitorReconfigureMain* monitor_reconfigure,
                const FilePath& run_dir)
     : backlight_controller_(backlight_controller),
       prefs_(prefs),
       metrics_lib_(metrics_lib),
       video_detector_(video_detector),
+      monitor_reconfigure_(monitor_reconfigure),
       low_battery_suspend_percent_(0),
       clean_shutdown_initiated_(false),
       low_battery_(false),
       enforce_lock_(false),
       use_xscreensaver_(false),
       plugged_state_(kPowerUnknown),
       idle_state_(kIdleUnknown),
       file_tagger_(FilePath(kTaggedFilePath)),
       shutdown_state_(kShutdownNone),
       suspender_(&locker_, &file_tagger_),
@@ skipping 628 matching lines @@
   dbus_message_append_args(signal,
                            DBUS_TYPE_INT32, &brightness,
                            DBUS_TYPE_BOOLEAN, &user_initiated_int,
                            DBUS_TYPE_INVALID);
   dbus_g_proxy_send(proxy.gproxy(), signal, NULL);
   dbus_message_unref(signal);
 }
 
 void Daemon::HandleResume() {
   file_tagger_.HandleResumeEvent();
-  backlight_controller_->SetPowerState(BACKLIGHT_ACTIVE_ON);
+  // Monitor reconfigure will set the backlight if needed.
+  monitor_reconfigure_->Run();
 }
 
 }  // namespace power_manager