chrome/browser/history/select_favicon_frames.cc - Issue 10908114: Move SelectFaviconFrames from favicon/ to history/

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: chrome/browser/history/select_favicon_frames.cc

Issue 10908114: Move SelectFaviconFrames from favicon/ to history/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/history/select_favicon_frames.h ('k') | chrome/browser/history/select_favicon_frames_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "chrome/browser/favicon/select_favicon_frames.h"	5 #include "chrome/browser/history/select_favicon_frames.h"

6	6

7 #include "skia/ext/image_operations.h"	7 #include "skia/ext/image_operations.h"

8 #include "third_party/skia/include/core/SkCanvas.h"	8 #include "third_party/skia/include/core/SkCanvas.h"

9 #include "ui/gfx/image/image.h"	9 #include "ui/gfx/image/image.h"

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

11 #include "ui/gfx/size.h"	11 #include "ui/gfx/size.h"

12	12

13 namespace {	13 namespace {

14	14

15 void SizesFromBitmaps(const std::vector<SkBitmap>& bitmaps,	15 void SizesFromBitmaps(const std::vector<SkBitmap>& bitmaps,

(...skipping 223 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
239 gfx::ImageSkia multi_image;	239 gfx::ImageSkia multi_image;

240 for (size_t i = 0; i < results.size(); ++i) {	240 for (size_t i = 0; i < results.size(); ++i) {

241 const SelectionResult& result = results[i];	241 const SelectionResult& result = results[i];

242 SkBitmap resized_bitmap = GetResizedBitmap(bitmaps[result.index],	242 SkBitmap resized_bitmap = GetResizedBitmap(bitmaps[result.index],

243 desired_size, result.scale_factor, result.resize_method);	243 desired_size, result.scale_factor, result.resize_method);

244 multi_image.AddRepresentation(	244 multi_image.AddRepresentation(

245 gfx::ImageSkiaRep(resized_bitmap, result.scale_factor));	245 gfx::ImageSkiaRep(resized_bitmap, result.scale_factor));

246 }	246 }

247 return multi_image;	247 return multi_image;

248 }	248 }

OLD	NEW