monitor_reconfigure: Clean up build and style.

src/platform/monitor_reconfig/monitor_reconfigure_main.h

Index: src/platform/monitor_reconfig/monitor_reconfigure_main.h
diff --git a/src/platform/monitor_reconfig/monitor_reconfigure_main.h b/src/platform/monitor_reconfig/monitor_reconfigure_main.h
index 7ce6889a39c0b184488373d96d8ff8a6e629dfc0..0b602d02fdf8524904750c3db69569ce9e163f81 100644
--- a/src/platform/monitor_reconfig/monitor_reconfigure_main.h
+++ b/src/platform/monitor_reconfig/monitor_reconfigure_main.h
@@ -2,19 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MONITOR_RECONFIGURE_MAIN_H_
-#define MONITOR_RECONFIGURE_MAIN_H_
+#ifndef MONITOR_RECONFIGURE_MONITOR_RECONFIGURE_MAIN_H_
+#define MONITOR_RECONFIGURE_MONITOR_RECONFIGURE_MAIN_H_
+
+#include <map>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/Xrandr.h>
-#include <stdlib.h>
-#include <string>
-#include <cstring>
-#include <iostream>
-#include <cstdio>
-#include <map>
 
-namespace chromeos_monitor_reconfig {
+namespace monitor_reconfig {
 
 // MonitorReconfigureMain is the class responsible for setting the external
 // monitor to the max resolution based on the modes supported by the native
@@ -23,35 +19,45 @@ class MonitorReconfigureMain {
  public:
   MonitorReconfigureMain(Display* display, XRRScreenResources* screen_info);
   virtual ~MonitorReconfigureMain() {}
+
   // Main entry point
   void Run();
+
   // Returns whether an external monitor is connected
   bool IsExternalMonitorConnected();
+
  private:
   // Finds the max resolution mode for the given |output|
   XRRModeInfo* FindMaxResolution(XRROutputInfo* output);
+
   // Finds the best matching resolution as compared to the |matching_mode|
   XRRModeInfo* FindBestMatchingResolution(XRRModeInfo* matching_mode);
+
   // Initializes the |notebook_output_| and |external_output_| fields
   void DetermineOutputs();
-  // Sets the resolution of the notebook's screen, the external monitors screen
-  // and the overall virtual screen to the gives sizes
+
+  // Sets the resolution of the notebook's screen, the external monitor's
+  // screen, and the overall virtual screen to the given size.
   void SetResolutions(XRRModeInfo* notebook_mode,
                       XRRModeInfo* external_mode,
                       XRRModeInfo* overall_screen_size);
+
   // Inline helper functions for FindBestMatchingResolution
   inline bool IsEqual(XRRModeInfo*, XRRModeInfo*);
   inline bool IsBiggerOrEqual(XRRModeInfo*, XRRModeInfo*);
   inline bool IsBetterMatching(XRRModeInfo* target, XRRModeInfo* to_match,
       XRRModeInfo* previous_best);
+
   // Mapping between mode XID's and mode information structures
-  std::map <int, XRRModeInfo*> mode_map_;
+  std::map<int, XRRModeInfo*> mode_map_;
+
   // X Resources needed between functions
   Display* display_;
   XRRScreenResources* screen_info_;
   XRROutputInfo* notebook_output_;
   XRROutputInfo* external_output_;
 };
-}
 
-#endif /* MONITOR_RECONFIGURE_MAIN_H_ */
+}  // namespace monitor_reconfig
+
+#endif  // MONITOR_RECONFIGURE_MONITOR_RECONFIGURE_MAIN_H_