Revert 112232 - Added hotkey support to 8508009

ui/aura/window.cc

Index: ui/aura/window.cc
===================================================================
--- ui/aura/window.cc	(revision 112233)
+++ ui/aura/window.cc	(working copy)
@@ -78,8 +78,20 @@
   layer_.reset(new ui::Layer(layer_type));
   layer_->SetVisible(false);
   layer_->set_delegate(this);
-  UpdateLayerName(name_);
 
+#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
+
   Desktop::GetInstance()->WindowInitialized(this);
 }
 
@@ -89,13 +101,6 @@
   type_ = type;
 }
 
-void Window::SetName(const std::string& name) {
-  name_ = name;
-
-  if (layer())
-    UpdateLayerName(name_);
-}
-
 void Window::Show() {
   SetVisible(true);
 }
@@ -538,21 +543,4 @@
     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