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