| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "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 "app/l10n_util_win.h" | 13 #include "app/l10n_util_win.h" |
| 14 #include "app/view_prop.h" | |
| 15 #include "base/logging.h" | 14 #include "base/logging.h" |
| 16 #include "base/scoped_ptr.h" | 15 #include "base/scoped_ptr.h" |
| 17 #include "gfx/native_theme_win.h" | 16 #include "gfx/native_theme_win.h" |
| 18 #include "ui/base/keycodes/keyboard_codes.h" | 17 #include "ui/base/keycodes/keyboard_codes.h" |
| 19 #include "ui/base/keycodes/keyboard_code_conversion_win.h" | 18 #include "ui/base/keycodes/keyboard_code_conversion_win.h" |
| 19 #include "ui/base/view_prop.h" |
| 20 #include "ui/base/win/hwnd_util.h" | 20 #include "ui/base/win/hwnd_util.h" |
| 21 #include "views/background.h" | 21 #include "views/background.h" |
| 22 #include "views/border.h" | 22 #include "views/border.h" |
| 23 #include "views/controls/native/native_view_host.h" | 23 #include "views/controls/native/native_view_host.h" |
| 24 #include "views/focus/focus_manager.h" | 24 #include "views/focus/focus_manager.h" |
| 25 #include "views/widget/widget.h" | 25 #include "views/widget/widget.h" |
| 26 | 26 |
| 27 using app::ViewProp; | 27 using ui::ViewProp; |
| 28 | 28 |
| 29 namespace views { | 29 namespace views { |
| 30 | 30 |
| 31 // Maps to the NativeControl. | 31 // Maps to the NativeControl. |
| 32 static const char* const kNativeControlKey = "__NATIVE_CONTROL__"; | 32 static const char* const kNativeControlKey = "__NATIVE_CONTROL__"; |
| 33 | 33 |
| 34 class NativeControlContainer : public CWindowImpl<NativeControlContainer, | 34 class NativeControlContainer : public CWindowImpl<NativeControlContainer, |
| 35 CWindow, | 35 CWindow, |
| 36 CWinTraits<WS_CHILD | WS_CLIPSIBLINGS | | 36 CWinTraits<WS_CHILD | WS_CLIPSIBLINGS | |
| 37 WS_CLIPCHILDREN>> { | 37 WS_CLIPCHILDREN>> { |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 } else if (message == WM_DESTROY) { | 384 } else if (message == WM_DESTROY) { |
| 385 ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler)); | 385 ui::SetWindowProc(window, reinterpret_cast<WNDPROC>(original_handler)); |
| 386 native_control->container_->prop_.reset(); | 386 native_control->container_->prop_.reset(); |
| 387 } | 387 } |
| 388 | 388 |
| 389 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window, | 389 return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window, |
| 390 message, w_param, l_param); | 390 message, w_param, l_param); |
| 391 } | 391 } |
| 392 | 392 |
| 393 } // namespace views | 393 } // namespace views |
| OLD | NEW |