Added hotkey support to 8508009

ui/aura/window.h

Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 9e1f05f972ad8a6ee824148c4bb2035356b04a6e..ae0ec6f88b4c9d54ce7a5bed70c0e5d8cd2f23bb 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -64,7 +64,7 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
   void set_id(int id) { id_ = id; }
 
   const std::string& name() const { return name_; }
-  void set_name(const std::string& name) { name_ = name; }
+  void SetName(const std::string& name);
 
   const string16 title() const { return title_; }
   void set_title(const string16& title) { title_ = title; }
@@ -297,6 +297,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
   // 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_;