| Index: views/controls/table/native_table_win.cc
|
| ===================================================================
|
| --- views/controls/table/native_table_win.cc (revision 71828)
|
| +++ views/controls/table/native_table_win.cc (working copy)
|
| @@ -9,13 +9,13 @@
|
|
|
| #include "app/l10n_util.h"
|
| #include "app/l10n_util_win.h"
|
| -#include "app/win/hwnd_util.h"
|
| #include "base/logging.h"
|
| #include "gfx/canvas_skia.h"
|
| #include "gfx/favicon_size.h"
|
| #include "gfx/icon_util.h"
|
| #include "skia/ext/skia_utils_win.h"
|
| #include "ui/base/models/table_model.h"
|
| +#include "ui/base/win/hwnd_util.h"
|
| #include "views/controls/table/table_view2.h"
|
| #include "views/controls/table/table_view_observer.h"
|
| #include "views/widget/widget.h"
|
| @@ -410,12 +410,12 @@
|
| DCHECK(header);
|
| SetWindowLongPtr(header, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
|
| header_original_handler_ =
|
| - app::win::SetWindowProc(header, &NativeTableWin::TableHeaderWndProc);
|
| + ui::SetWindowProc(header, &NativeTableWin::TableHeaderWndProc);
|
| }
|
|
|
| SetWindowLongPtr(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
|
| original_handler_ =
|
| - app::win::SetWindowProc(hwnd, &NativeTableWin::TableWndProc);
|
| + ui::SetWindowProc(hwnd, &NativeTableWin::TableWndProc);
|
|
|
| // Bug 964884: detach the IME attached to this window.
|
| // We should attach IMEs only when we need to input CJK strings.
|
|
|