Revert 112232 - Added hotkey support to 8508009

ui/aura/window.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 60 matching lines @@
   STLDeleteElements(&transient_children);
   DCHECK(transient_children_.empty());
 
   FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowDestroyed(this));
 }
 
 void Window::Init(ui::Layer::LayerType layer_type) {
   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);
 }
 
 void Window::SetType(WindowType type) {
   // Cannot change type after the window is initialized.
   DCHECK(!layer());
   type_ = type;
 }
 
-void Window::SetName(const std::string& name) {
-  name_ = name;
-
-  if (layer())
-    UpdateLayerName(name_);
-}
-
 void Window::Show() {
   SetVisible(true);
 }
 
 void Window::Hide() {
   SetVisible(false);
   ReleaseCapture();
   if (Desktop::GetInstance()->active_window() == this ||
       !Desktop::GetInstance()->active_window()) {
     Desktop::GetInstance()->ActivateTopmostWindow();
@@ skipping 422 matching lines @@
 
 void Window::OnStackingChanged() {
   FOR_EACH_OBSERVER(WindowObserver, observers_, OnWindowStackingChanged(this));
 }
 
 void Window::OnPaintLayer(gfx::Canvas* canvas) {
   if (delegate_)
     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