chrome/browser/history/select_favicon_frames_unittest.cc - Issue 246893004: Moves SelectFaviconFrames from history to favicon_base component.

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_unittest.cc

Issue 246893004: Moves SelectFaviconFrames from history to favicon_base component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed 64 bits v2. Created 6 years, 7 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

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/history/select_favicon_frames.h"	5 #include "components/favicon_base/select_favicon_frames.h"

6	6

7 #include "ui/base/layout.h"

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

9 #include "testing/gtest/include/gtest/gtest.h"	7 #include "testing/gtest/include/gtest/gtest.h"

10 #include "third_party/skia/include/core/SkBitmap.h"	8 #include "third_party/skia/include/core/SkBitmap.h"

11 #include "third_party/skia/include/core/SkColor.h"	9 #include "third_party/skia/include/core/SkColor.h"

	10 #include "ui/base/layout.h"

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

12	12

13 using std::vector;	13 using std::vector;

14	14

15 namespace {	15 namespace {

16	16

17 vector<ui::ScaleFactor> Scale1x() {	17 vector<ui::ScaleFactor> Scale1x() {

18 return vector<ui::ScaleFactor>(1, ui::SCALE_FACTOR_100P);	18 return vector<ui::ScaleFactor>(1, ui::SCALE_FACTOR_100P);

19 }	19 }

20	20

21 vector<ui::ScaleFactor> Scale1x2x() {	21 vector<ui::ScaleFactor> Scale1x2x() {

(...skipping 243 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
265 bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));	265 bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 15, 15));

266 vector<gfx::Size> sizes2;	266 vector<gfx::Size> sizes2;

267 sizes2.push_back(gfx::Size(15, 15));	267 sizes2.push_back(gfx::Size(15, 15));

268 float score2;	268 float score2;

269 SelectFaviconFrames(bitmaps2, sizes2, Scale1x(), 16, &score2);	269 SelectFaviconFrames(bitmaps2, sizes2, Scale1x(), 16, &score2);

270	270

271 EXPECT_GT(score2, score1);	271 EXPECT_GT(score2, score1);

272 }	272 }

273	273

274 } // namespace	274 } // namespace

OLD	NEW

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