chrome/browser/ui/views/extensions/native_app_window_views.cc - Issue 12881003: ShortcutInfo::favicon is now a gfx::ImageFamily instead of gfx::Image.

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: chrome/browser/ui/views/extensions/native_app_window_views.cc

Issue 12881003: ShortcutInfo::favicon is now a gfx::ImageFamily instead of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix UpdateIcon on Mac (get the correct image representation from NSImage). Created 7 years, 8 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

« chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc ('K') | « chrome/browser/ui/views/create_application_shortcut_view.cc ('k') | chrome/browser/ui/web_applications/web_app_ui.cc » ('j') | chrome/browser/web_applications/web_app_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/extensions/native_app_window_views.cc

diff --git a/chrome/browser/ui/views/extensions/native_app_window_views.cc b/chrome/browser/ui/views/extensions/native_app_window_views.cc

index a06861e73df433fc582798a8e2bda54ddaed5d52..5dec657b22ed77a00baa85368fb415a1e7b2d0cc 100644

--- a/chrome/browser/ui/views/extensions/native_app_window_views.cc

+++ b/chrome/browser/ui/views/extensions/native_app_window_views.cc

@@ -105,8 +105,7 @@ void CreateIconAndSetRelaunchDetails(

return;

}

ui::win::SetAppIconForWindow(icon_file.value(), hwnd);

- web_app::internals::CheckAndSaveIcon(icon_file,

- *shortcut_info.favicon.ToSkBitmap());

+ web_app::internals::CheckAndSaveIcon(icon_file, shortcut_info.favicon);

}

#endif