| Index: ui/views/win/hwnd_message_handler.cc
|
| diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
|
| index 01b3f7dcc052c504227acdfc4665d051b0b245fa..cace3e6c69c8156064879eba5903b55b20e570be 100644
|
| --- a/ui/views/win/hwnd_message_handler.cc
|
| +++ b/ui/views/win/hwnd_message_handler.cc
|
| @@ -913,9 +913,18 @@ void HWNDMessageHandler::DispatchKeyEventPostIME(const ui::KeyEvent& key) {
|
|
|
| HICON HWNDMessageHandler::GetDefaultWindowIcon() const {
|
| if (use_system_default_icon_)
|
| - return NULL;
|
| - return ViewsDelegate::views_delegate ?
|
| - ViewsDelegate::views_delegate->GetDefaultWindowIcon() : NULL;
|
| + return nullptr;
|
| + return ViewsDelegate::views_delegate
|
| + ? ViewsDelegate::views_delegate->GetDefaultWindowIcon()
|
| + : nullptr;
|
| +}
|
| +
|
| +HICON HWNDMessageHandler::GetSmallWindowIcon() const {
|
| + if (use_system_default_icon_)
|
| + return nullptr;
|
| + return ViewsDelegate::views_delegate
|
| + ? ViewsDelegate::views_delegate->GetSmallWindowIcon()
|
| + : nullptr;
|
| }
|
|
|
| LRESULT HWNDMessageHandler::OnWndProc(UINT message,
|
|
|