Merge monitor_reconfigure into powerd.

powerd_main.cc

-// Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+// 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 <gdk/gdk.h>
 #include <gflags/gflags.h>
 
 #include <string>
 #include <syslog.h>
 
 // Defines from syslog.h that conflict with base/logging.h. Ugh.
 #undef LOG_INFO
 #undef LOG_WARNING
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "cros/chromeos_cros_api.h"
 #include "power_manager/ambient_light_sensor.h"
 #include "power_manager/backlight.h"
+#include "power_manager/monitor_reconfigure.h"
 #include "power_manager/powerd.h"
 
 #ifndef VCSID
 #define VCSID "<not set>"
 #endif
 
 using std::string;
 
 DEFINE_string(prefs_dir, "",
               "Directory to store settings.");
@@ skipping 63 matching lines @@
   LOG_IF(WARNING, !backlight_ctl.Init()) << "Cannot initialize backlight "
       "controller";
   power_manager::AmbientLightSensor als(&backlight_ctl);
   if (!als.Init())
     LOG(WARNING) << "Cannot initialize light sensor";
   power_manager::VideoDetector video_detector;
   video_detector.Init();
   MetricsLibrary metrics_lib;
   metrics_lib.Init();
   FilePath run_dir(FLAGS_run_dir);
+  power_manager::MonitorReconfigureMain monitor_reconfigure(&backlight_ctl);
+  if (!monitor_reconfigure.Init())
+    LOG(WARNING) << "Cannot initialize monitor reconfigure";
   power_manager::Daemon daemon(&backlight_ctl, &prefs, &metrics_lib,
-                               &video_detector, run_dir);
+                               &video_detector, &monitor_reconfigure, run_dir);
   daemon.Init();
   daemon.Run();
   return 0;
 }