content/public/browser/favicon_status.cc - Issue 10832128: Convert FaviconStatus::bitmap from SkBitmap to gfx::Image.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/public/browser/favicon_status.cc

Issue 10832128: Convert FaviconStatus::bitmap from SkBitmap to gfx::Image. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tests? Created 8 years, 4 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:

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "content/public/browser/favicon_status.h"	5 #include "content/public/browser/favicon_status.h"

6	6

7 #include "content/public/browser/content_browser_client.h"	7 #include "content/public/browser/content_browser_client.h"

8 #include "ui/gfx/image/image_skia.h"	8 #include "ui/gfx/image/image_skia.h"

9	9

10 namespace content {	10 namespace content {

11	11

12 FaviconStatus::FaviconStatus() : valid(false) {	12 FaviconStatus::FaviconStatus() : valid(false) {

13 bitmap = *GetContentClient()->browser()->GetDefaultFavicon()->bitmap();	13 image = gfx::Image(*GetContentClient()->browser()->GetDefaultFavicon());

	14 }

	15

	16 SkBitmap FaviconStatus::AsBitmap() const {

	17 return image.IsEmpty() ? SkBitmap() : *image.ToSkBitmap();

14 }	18 }

15	19

16 } // namespace content	20 } // namespace content

OLD	NEW