chrome/browser/ui/tests/ui_gfx_image_unittest.cc - Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

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

Unified Diff: chrome/browser/ui/tests/ui_gfx_image_unittest.cc

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/panels/panel_browser_frame_view.cc ('k') | chrome/browser/ui/views/autocomplete/autocomplete_result_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tests/ui_gfx_image_unittest.cc

diff --git a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc

index 6640a6373708391cdf2505cde3f98ceb914e16da..dedf6df32dfc5f00ed7c8b527013fccffd6bf727 100644

--- a/chrome/browser/ui/tests/ui_gfx_image_unittest.cc

+++ b/chrome/browser/ui/tests/ui_gfx_image_unittest.cc

@@ -1,4 +1,4 @@

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

// found in the LICENSE file.

@@ -30,7 +30,7 @@ TEST(UiGfxImageTest, ViewsImageView) {

container->SetVisible(true);

scoped_ptr<views::ImageView> image_view(new views::ImageView());

- image_view->SetImage(*image.ToSkBitmap());

+ image_view->SetImage(*image.ToImageSkia());

container->AddChildView(image_view.get());

}

#endif