Revert 112232 - Added hotkey support to 8508009

ui/aura/window.h

Index: ui/aura/window.h
===================================================================
--- ui/aura/window.h	(revision 112233)
+++ ui/aura/window.h	(working copy)
@@ -64,7 +64,7 @@
   void set_id(int id) { id_ = id; }
 
   const std::string& name() const { return name_; }
-  void SetName(const std::string& name);
+  void set_name(const std::string& name) { name_ = name; }
 
   const string16 title() const { return title_; }
   void set_title(const string16& title) { title_ = title; }
@@ -297,9 +297,6 @@
   // Overridden from ui::LayerDelegate:
   virtual void OnPaintLayer(gfx::Canvas* canvas) OVERRIDE;
 
-  // Updates the layer name with a name based on the window's name and id.
-  void UpdateLayerName(const std::string& name);
-
   WindowType type_;
 
   WindowDelegate* delegate_;