Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(470)

Unified Diff: ui/views/win/hwnd_message_handler.cc

Issue 772533002: Fix icon on Windows XP taskbar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some doc + git cl format Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/win/hwnd_message_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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,
« no previous file with comments | « ui/views/win/hwnd_message_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698