chrome/browser/profiles/profile_info_util_unittest.cc - Issue 10573030: Revert 143171 - Merge 143074 - Make avatar images HiDPI.

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/profiles/profile_info_util_unittest.cc

Issue 10573030: Revert 143171 - Merge 143074 - Make avatar images HiDPI. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/

Patch Set: Created 8 years, 6 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

Property Changes:

Deleted: svn:eol-style
- LF

« no previous file with comments | « chrome/browser/profiles/profile_info_cache.cc ('k') | no next file » | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 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 "chrome/browser/profiles/profile_info_util.h"	5 #include "chrome/browser/profiles/profile_info_util.h"

6	6

7 #include "grit/generated_resources.h"	7 #include "grit/generated_resources.h"

8 #include "grit/theme_resources_standard.h"	8 #include "grit/theme_resources.h"

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

10 #include "ui/base/resource/resource_bundle.h"	10 #include "ui/base/resource/resource_bundle.h"

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

12	12

13 namespace {	13 namespace {

14	14

15 TEST(ProfileInfoUtilTest, MenuIcon) {	15 TEST(ProfileInfoUtilTest, MenuIcon) {

16 // Test that an avatar icon isn't changed.	16 // Test that an avatar icon isn't changed.

17 const gfx::Image& profile_image(	17 const gfx::Image& profile_image(

18 ResourceBundle::GetSharedInstance().GetImageNamed(IDR_PROFILE_AVATAR_0));	18 ResourceBundle::GetSharedInstance().GetImageNamed(IDR_PROFILE_AVATAR_0));

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53	53

54 // Test that a GAIA picture is changed.	54 // Test that a GAIA picture is changed.

55 gfx::Image gaia_picture(gfx::test::CreateImage());	55 gfx::Image gaia_picture(gfx::test::CreateImage());

56 gfx::Image result2 = profiles::GetAvatarIconForTitleBar(	56 gfx::Image result2 = profiles::GetAvatarIconForTitleBar(

57 gaia_picture, true, 100, 40);	57 gaia_picture, true, 100, 40);

58 EXPECT_FALSE(gfx::test::IsEmpty(result2));	58 EXPECT_FALSE(gfx::test::IsEmpty(result2));

59 EXPECT_FALSE(gfx::test::IsEqual(gaia_picture, result2));	59 EXPECT_FALSE(gfx::test::IsEqual(gaia_picture, result2));

60 }	60 }

61	61

62 } // namespace	62 } // namespace

OLD	NEW