| Index: views/widget/child_window_message_processor.cc
|
| ===================================================================
|
| --- views/widget/child_window_message_processor.cc (revision 66785)
|
| +++ views/widget/child_window_message_processor.cc (working copy)
|
| @@ -4,27 +4,24 @@
|
|
|
| #include "views/widget/child_window_message_processor.h"
|
|
|
| -#include "app/view_prop.h"
|
| -#include "base/logging.h"
|
| +#include "app/win/scoped_prop.h"
|
|
|
| -#include "app/view_prop.h"
|
| -
|
| namespace views {
|
|
|
| -static const char* const kChildWindowKey = "__CHILD_WINDOW_MESSAGE_PROCESSOR__";
|
| +static const wchar_t* kChildWindowKey = L"__CHILD_WINDOW_MESSAGE_PROCESSOR__";
|
|
|
| // static
|
| -ViewProp* ChildWindowMessageProcessor::Register(
|
| +app::win::ScopedProp* ChildWindowMessageProcessor::Register(
|
| HWND hwnd,
|
| ChildWindowMessageProcessor* processor) {
|
| DCHECK(processor);
|
| - return new ViewProp(hwnd, kChildWindowKey, processor);
|
| + return new app::win::ScopedProp(hwnd, kChildWindowKey, processor);
|
| }
|
|
|
| // static
|
| ChildWindowMessageProcessor* ChildWindowMessageProcessor::Get(HWND hwnd) {
|
| return reinterpret_cast<ChildWindowMessageProcessor*>(
|
| - ViewProp::GetValue(hwnd, kChildWindowKey));
|
| + ::GetProp(hwnd, kChildWindowKey));
|
| }
|
|
|
| } // namespace
|
|
|