Convert IconLoader and IconManager to deal with gfx::Image rather than SkBitmap.

Convert IconLoader and IconManager to deal with gfx::Image rather than SkBitmap.

This allows loading of icons in the platform format, avoiding unnecessary
conversions if the image is going to be used with the platform toolkit. In other
cases, this just pushes image conversion to the callsite rather than the actual
image load.

BUG=19685
TEST=unit_tests and visual inspection of icons in the download shelf

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=76743

[Robert Sesek, 2011-03-01 17:25:05]

estade: overall IconManager/Loader changes, Linux changes
thakis: Mac changes

[Nico, 2011-03-02 02:31:33]

LG

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.cc
File chrome/browser/icon_loader.cc (right):

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.c...
chrome/browser/icon_loader.cc:43: image = image_.release();  // Can't ignore
return value.
The usual pattern for this is
  (void)image_.release();

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader_m...
File chrome/browser/icon_loader_mac.mm (right):

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader_m...
chrome/browser/icon_loader_mac.mm:22: image_.reset(new gfx::Image([icon
retain]));
\o/

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/ui/views/down...
File chrome/browser/ui/views/download_item_view.cc (right):

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/ui/views/down...
chrome/browser/ui/views/download_item_view.cc:659: const SkBitmap* icon = NULL;
if(IsDangerousMode())
  icon = warning_icon;
else if (image)
  icon = *image;

http://codereview.chromium.org/6597043/diff/3030/ui/gfx/image.cc
File ui/gfx/image.cc (right):

http://codereview.chromium.org/6597043/diff/3030/ui/gfx/image.cc#newcode214
ui/gfx/image.cc:214: other->default_representation_ = type;
std::swap()?

[Robert Sesek, 2011-03-02 14:05:36]

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.cc
File chrome/browser/icon_loader.cc (right):

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.c...
chrome/browser/icon_loader.cc:43: image = image_.release();  // Can't ignore
return value.
On 2011/03/02 02:31:33, Nico wrote:
> The usual pattern for this is
>   (void)image_.release();

This doesn't suppress the warning.

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/ui/views/down...
File chrome/browser/ui/views/download_item_view.cc (right):

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/ui/views/down...
chrome/browser/ui/views/download_item_view.cc:659: const SkBitmap* icon = NULL;
On 2011/03/02 02:31:33, Nico wrote:
> if(IsDangerousMode())
>   icon = warning_icon;
> else if (image)
>   icon = *image;

Done.

http://codereview.chromium.org/6597043/diff/3030/ui/gfx/image.cc
File ui/gfx/image.cc (right):

http://codereview.chromium.org/6597043/diff/3030/ui/gfx/image.cc#newcode214
ui/gfx/image.cc:214: other->default_representation_ = type;
On 2011/03/02 02:31:33, Nico wrote:
> std::swap()?

Done.

[Evan Stade, 2011-03-02 22:48:57]

cool, lgtm

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.cc
File chrome/browser/icon_loader.cc (right):

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.c...
chrome/browser/icon_loader.cc:43: image = image_.release();  // Can't ignore
return value.
On 2011/03/02 14:05:36, rsesek wrote:
> On 2011/03/02 02:31:33, Nico wrote:
> > The usual pattern for this is
> >   (void)image_.release();
> 
> This doesn't suppress the warning.

ignore_result(image_.release());

(defined in basictypes.h)

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/download/down...
File chrome/browser/download/download_util.cc (right):

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/download/down...
chrome/browser/download/download_util.cc:57: #include "ui/gfx/image.h"
alphabet

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/ui/gtk/custom...
File chrome/browser/ui/gtk/custom_drag.cc (right):

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/ui/gtk/custom...
chrome/browser/ui/gtk/custom_drag.cc:110: if (icon) {
nit: no curlies

[Robert Sesek, 2011-03-03 15:48:46]

Submitting.

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.cc
File chrome/browser/icon_loader.cc (right):

http://codereview.chromium.org/6597043/diff/3030/chrome/browser/icon_loader.c...
chrome/browser/icon_loader.cc:43: image = image_.release();  // Can't ignore
return value.
On 2011/03/02 22:48:57, Evan Stade wrote:
> On 2011/03/02 14:05:36, rsesek wrote:
> > On 2011/03/02 02:31:33, Nico wrote:
> > > The usual pattern for this is
> > >   (void)image_.release();
> > 
> > This doesn't suppress the warning.
> 
> ignore_result(image_.release());
> 
> (defined in basictypes.h)

Done.

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/download/down...
File chrome/browser/download/download_util.cc (right):

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/download/down...
chrome/browser/download/download_util.cc:57: #include "ui/gfx/image.h"
On 2011/03/02 22:48:57, Evan Stade wrote:
> alphabet

Done.

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/ui/gtk/custom...
File chrome/browser/ui/gtk/custom_drag.cc (right):

http://codereview.chromium.org/6597043/diff/8001/chrome/browser/ui/gtk/custom...
chrome/browser/ui/gtk/custom_drag.cc:110: if (icon) {
On 2011/03/02 22:48:57, Evan Stade wrote:
> nit: no curlies

Done.