wm: Update namespace and header define guards.

src/platform/window_manager/key_bindings.h

 // Copyright (c) 2009 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 __PLATFORM_WINDOW_MANAGER_KEY_BINDINGS_H__
-#define __PLATFORM_WINDOW_MANAGER_KEY_BINDINGS_H__
+#ifndef WINDOW_MANAGER_KEY_BINDINGS_H_
+#define WINDOW_MANAGER_KEY_BINDINGS_H_
 
 // KeyBindings
 //
 // The KeyBindings class supports installing named actions and keyboard combos
 // that trigger an installed action.
 //
 // A named action can have begin, repeat, and end callbacks associated with it
 // which correspond to key down, key repeat, and key release respectively.
 // Any of these callbacks may be NULL. Any number of KeyCombo's can be bound
 // to a given action. A KeyCombo is a keysym and modifier combination such as
@@ skipping 14 matching lines @@
 #include <X11/Xlib.h>
 }
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "chromeos/callback.h"
 
 typedef ::Window XWindow;
 
-namespace chromeos {
+namespace window_manager {
 
 struct Action;
 class XConnection;
 
 class KeyBindings {
  public:
   // Set of possible modifer mask bits. OR these together to create a KeyCombo
   // modifiers value.
   static const uint kShiftMask = ShiftMask;
   static const uint kLockMask = LockMask;
@@ skipping 16 matching lines @@
   };
   struct KeyComboComparator {
     bool operator()(const KeyCombo& a,
                     const KeyCombo& b) const;
   };
 
   KeyBindings(XConnection* xconn);
   ~KeyBindings();
 
   // Add a new action. This will fail if the action already exists.
-  // NOTE: The KeyBindings class will take ownership of passed in callbacks.
+  // NOTE: The KeyBindings class will take ownership of passed-in
+  // callbacks, any of which may be NULL.
   bool AddAction(const std::string& action_name,
-                 Closure* begin_closure,   // [optional] On combo press
-                 Closure* repeat_closure,  // [optional] On combo auto-repeat
-                 Closure* end_closure);    // [optional] On combo release
+                 chromeos::Closure* begin_closure,   // On combo press
+                 chromeos::Closure* repeat_closure,  // On combo auto-repeat
+                 chromeos::Closure* end_closure);    // On combo release
 
   // Removes an action. Any key bindings to this action will also be removed.
   bool RemoveAction(const std::string& action_name);
 
   // Add a binding from the given KeyCombo to the action. KeyCombo's must be
   // unique, but it is fine to have more than one combo map to a given action.
   bool AddBinding(const KeyCombo& combo,
                   const std::string& action_name);
 
   // Remove the KeyCombo. This may fail if the action to which the combo was
@@ skipping 13 matching lines @@
 
   typedef std::map<std::string, Action*> ActionMap;
   ActionMap actions_;
 
   typedef std::map<KeyCombo, std::string, KeyComboComparator> BindingsMap;
   BindingsMap bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(KeyBindings);
 };
 
-}  // namespace chromeos
+}  // namespace window_manager
 
-#endif  // __PLATFORM_WINDOW_MANAGER_KEY_BINDINGS_H__
+#endif