Revert "Reverting 23406" as it didn't break any tests....

base/window_impl.cc

 // Copyright (c) 2009 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 <list>
 
 #include "base/singleton.h"
 #include "base/string_util.h"
 #include "base/window_impl.h"
 #include "base/win_util.h"
@@ skipping 78 matching lines @@
     // The ATOM returned from creating the window.
     ATOM atom;
   };
 
   ClassRegistrar() : registered_count_(0) { }
   friend struct DefaultSingletonTraits<ClassRegistrar>;
 
   typedef std::list<RegisteredClass> RegisteredClasses;
   RegisteredClasses registered_classes_;
 
-  // Counter of how many classes have ben registered so far.
+  // Counter of how many classes have been registered so far.
   int registered_count_;
 
   DISALLOW_COPY_AND_ASSIGN(ClassRegistrar);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // WindowImpl, public
 
 WindowImpl::WindowImpl()
     : window_style_(0),
@@ skipping 19 matching lines @@
   int x, y, width, height;
   if (bounds.IsEmpty()) {
     x = y = width = height = CW_USEDEFAULT;
   } else {
     x = bounds.x();
     y = bounds.y();
     width = bounds.width();
     height = bounds.height();
   }
 
-  hwnd_ = CreateWindowEx(window_ex_style_, GetWindowClassName().c_str(), L"",
+  hwnd_ = CreateWindowEx(window_ex_style_, GetWindowClassName().c_str(), NULL,
                          window_style_, x, y, width, height,
                          parent, NULL, NULL, this);
   DCHECK(hwnd_);
 
   // The window procedure should have set the data for us.
   DCHECK(win_util::GetWindowUserData(hwnd_) == this);
 }
 
-gfx::NativeView WindowImpl::GetNativeView() const {
-  return hwnd_;
-}
-
 HICON WindowImpl::GetDefaultWindowIcon() const {
   return NULL;
 }
 
-BOOL WindowImpl::DestroyWindow() {
-  DCHECK(::IsWindow(GetNativeView()));
-  return ::DestroyWindow(GetNativeView());
-}
-
 LRESULT WindowImpl::OnWndProc(UINT message, WPARAM w_param, LPARAM l_param) {
-  HWND window = GetNativeView();
   LRESULT result = 0;
 
   // Handle the message if it's in our message map; otherwise, let the system
   // handle it.
-  if (!ProcessWindowMessage(window, message, w_param, l_param, result))
-    result = DefWindowProc(window, message, w_param, l_param);
+  if (!ProcessWindowMessage(hwnd_, message, w_param, l_param, result))
+    result = DefWindowProc(hwnd_, message, w_param, l_param);
 
   return result;
 }
 
 // static
 LRESULT CALLBACK WindowImpl::WndProc(HWND hwnd,
                                      UINT message,
                                      WPARAM w_param,
                                      LPARAM l_param) {
   if (message == WM_NCCREATE) {
@@ skipping 35 matching lines @@
   class_ex.hIconSm = class_ex.hIcon;
   ATOM atom = RegisterClassEx(&class_ex);
   DCHECK(atom);
 
   Singleton<ClassRegistrar>()->RegisterClass(class_info, name, atom);
 
   return name;
 }
 
 }  // namespace base