Merge monitor_reconfigure into powerd.

udev_controller.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_MANAGER_UDEV_CONTROLLER_H_
+#define POWER_MANAGER_UDEV_CONTROLLER_H_
+
+#include <glib.h>
+#include <libudev.h>
+#include <string>

[tfarina, 2011/04/15 15:00:37]

please, add a line between libudev.h and string.

[marcheu, 2011/04/15 17:32:23]

Done.

+
+#include "base/basictypes.h"
+
+namespace power_manager {
+
+class UdevDelegate {
+ public:
+  virtual ~UdevDelegate() {}
+  virtual void Run(GIOChannel* source, GIOCondition condition) = 0;
+};
+
+class UdevController {
+ public:
+  UdevController(UdevDelegate* delegate, const std::string& subsystem);
+  ~UdevController();
+  bool Init();

[tfarina, 2011/04/15 15:00:37]

please add a line above.

[marcheu, 2011/04/15 17:32:23]

Done.

+
+ private:
+  static gboolean EventHandler(GIOChannel* source,
+                               GIOCondition condition,
+                               gpointer data);
+
+  // Delegate for udev event; not owned.
+  UdevDelegate* delegate_;
+
+  struct udev_monitor* monitor_;
+  struct udev* udev_;
+  std::string subsystem_;

[tfarina, 2011/04/15 15:00:37]

I'd suggest moving this to line 35 (so it matches with the order in the ctor).
Also, could you document this variable?

[marcheu, 2011/04/15 17:32:23]

Done.

+
+  DISALLOW_COPY_AND_ASSIGN(UdevController);
+};
+
+} // namespace power_manager
+
+#endif  // POWER_MANAGER_UDEV_CONTROLLER_H_