Added hotkey support to 8508009

ui/aura/window.cc

Index: ui/aura/window.cc
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 57f7cb739d3a5ab4e62d21c79fe9942dfaf4732c..1560373125539a16a4a663c7c6b371b9bf3e4e1c 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -75,18 +75,7 @@ void Window::Init(ui::Layer::LayerType layer_type) {
   layer_.reset(new ui::Layer(Desktop::GetInstance()->compositor(), layer_type));
   layer_->SetVisible(false);
   layer_->set_delegate(this);
-#if !defined(NDEBUG)
-  std::string layer_name(name_);
-  if (layer_name.empty())
-    layer_name.append("Unnamed Window");
-
-  if (id_ != -1) {
-    char id_buf[10];
-    base::snprintf(id_buf, sizeof(id_buf), " %d", id_);
-    layer_name.append(id_buf);
-  }
-  layer_->set_name(layer_name);
-#endif
+  UpdateLayerName(name_);
 }
 
 void Window::SetType(WindowType type) {
@@ -95,6 +84,13 @@ void Window::SetType(WindowType type) {
   type_ = type;
 }
 
+void Window::SetName(const std::string& name) {
+  name_ = name;
+
+  if (layer())
+    UpdateLayerName(name_);
+}
+
 void Window::Show() {
   SetVisible(true);
 }
@@ -508,4 +504,21 @@ void Window::OnPaintLayer(gfx::Canvas* canvas) {
     delegate_->OnPaint(canvas);
 }
 
+void Window::UpdateLayerName(const std::string& name) {
+#if !defined(NDEBUG)
+  DCHECK(layer());
+
+  std::string layer_name(name_);
+  if (layer_name.empty())
+    layer_name.append("Unnamed Window");
+
+  if (id_ != -1) {
+    char id_buf[10];
+    base::snprintf(id_buf, sizeof(id_buf), " %d", id_);
+    layer_name.append(id_buf);
+  }
+  layer()->set_name(layer_name);
+#endif
+}
+
 }  // namespace aura