ui/views/win/hwnd_message_handler.cc - Issue 10967036: views: Packaged app window icon should be system/generic icon, if icon is not set by default.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10967036: views: Packaged app window icon should be system/generic icon, if icon is not set by default. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 3 months 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

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 d8122b09abded8dadd1a21340606d78280c8c715..3848cb998f28bb31ece7d56041d7908071eed0ae 100644

--- a/ui/views/win/hwnd_message_handler.cc

+++ b/ui/views/win/hwnd_message_handler.cc

@@ -898,6 +898,8 @@ void HWNDMessageHandler::DispatchKeyEventPostIME(const ui::KeyEvent& key) {

// HWNDMessageHandler, ui::WindowImpl overrides:

HICON HWNDMessageHandler::GetDefaultWindowIcon() const {

+ if (use_sytem_default_icon_)

+ return NULL;

return ViewsDelegate::views_delegate ?

ViewsDelegate::views_delegate->GetDefaultWindowIcon() : NULL;

}

« no previous file with comments | « ui/views/win/hwnd_message_handler.h ('k') | no next file » | no next file with comments »