Hello andreip,
I'd like you to do a code review. Please execute
g4 diff -c 10394318
or point your web browser to
http://mondrian/10394318
to review the following code:
Change 10394318 by stevebl...@steveblock-gears3 on 2009/03/06 12:34:46 *pending*
Makes sure that unnecessary shortcut icons are not downloaded on WinCE.
This fixes Gears bug 846.
R=andreip
[email protected]
DELTA=5 (5 added, 0 deleted, 0 changed)
OCL=10394318
Affected files ...
... //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#83 edit
5 delta lines: 5 added, 0 deleted, 0 changed
Also consider running:
g4 lint -c 10394318
which verifies that the changelist doesn't introduce new style violations.
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [email protected].
Change 10394318 by stevebl...@steveblock-gears3 on 2009/03/06 12:34:46 *pending*
Makes sure that unnecessary shortcut icons are not downloaded on WinCE.
This fixes Gears bug 846.
Affected files ...
... //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#83 edit
==== //depot/googleclient/gears/opensource/gears/desktop/desktop.cc#83 -
c:\MyDocs\Gears3/googleclient/gears/opensource/gears/desktop/desktop.cc ====
# action=edit type=text
--- googleclient/gears/opensource/gears/desktop/desktop.cc 2009-03-06
12:35:53.000000000 +0000
+++ googleclient/gears/opensource/gears/desktop/desktop.cc 2009-03-06
12:27:49.000000000 +0000
@@ -378,9 +378,14 @@
// Get the icons the user specified
icons->GetPropertyAsString(STRING16(L"16x16"), &shortcut_info.icon16x16.url);
icons->GetPropertyAsString(STRING16(L"32x32"), &shortcut_info.icon32x32.url);
+#ifdef OS_WINCE
+ // WinCE does not use the 4x48 or 128x128 icons. See CreateIcoFile(). We
+ // ignore URLS for these sizes to avoid unnecessary downloads.
+#else
icons->GetPropertyAsString(STRING16(L"48x48"), &shortcut_info.icon48x48.url);
icons->GetPropertyAsString(STRING16(L"128x128"),
&shortcut_info.icon128x128.url);
+#endif
// Prepare the shortcut.
Desktop desktop(EnvPageSecurityOrigin(), EnvPageBrowsingContext());
