| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/controls/native_control.h" | 5 #include "ui/views/controls/native_control.h" |
| 6 | 6 |
| 7 #include <atlbase.h> | 7 #include <atlbase.h> |
| 8 #include <atlapp.h> | 8 #include <atlapp.h> |
| 9 #include <atlcrack.h> | 9 #include <atlcrack.h> |
| 10 #include <atlframe.h> | 10 #include <atlframe.h> |
| 11 #include <atlmisc.h> | 11 #include <atlmisc.h> |
| 12 | 12 |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "ui/base/accessibility/accessibility_types.h" | 15 #include "ui/base/accessibility/accessibility_types.h" |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 } else if (message == WM_DESTROY) { | 383 } else if (message == WM_DESTROY) { |
| 384 ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler)); | 384 ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler)); |
| 385 native_control->container_->prop_.reset(); | 385 native_control->container_->prop_.reset(); |
| 386 } | 386 } |
| 387 | 387 |
| 388 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window, | 388 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window, |
| 389 message, w_param, l_param); | 389 message, w_param, l_param); |
| 390 } | 390 } |
| 391 | 391 |
| 392 } // namespace views | 392 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 8687031:
views: Move the remaining files to ui/views/controls/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src