ui/gfx/canvas_direct2d_unittest.cc - Issue 7698005: Move base/resource_util.* into base/win/ since it's windows specific.

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: ui/gfx/canvas_direct2d_unittest.cc

Issue 7698005: Move base/resource_util.* into base/win/ since it's windows specific. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 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:

Index: ui/gfx/canvas_direct2d_unittest.cc

diff --git a/ui/gfx/canvas_direct2d_unittest.cc b/ui/gfx/canvas_direct2d_unittest.cc

index 740f766be650e10339886415e2d898012f9500c8..05aa57d5c6bf1b2b245da5161a5dda9f89b8b521 100644

--- a/ui/gfx/canvas_direct2d_unittest.cc

+++ b/ui/gfx/canvas_direct2d_unittest.cc

@@ -10,7 +10,7 @@

#include "base/command_line.h"

#include "base/memory/ref_counted_memory.h"

#include "base/memory/scoped_ptr.h"

-#include "base/resource_util.h"

+#include "base/win/resource_util.h"

#include "grit/gfx_resources.h"

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

#include "ui/gfx/brush.h"

@@ -112,8 +112,8 @@ SkBitmap LoadBitmapFromResources(int resource_id) {

HINSTANCE resource_instance = GetModuleHandle(NULL);

void* data_ptr;

size_t data_size;

- if (base::GetDataResourceFromModule(resource_instance, resource_id, &data_ptr,

- &data_size)) {

+ if (base::win::GetDataResourceFromModule(resource_instance, resource_id,

+ &data_ptr, &data_size)) {

scoped_refptr<RefCountedMemory> memory(new RefCountedStaticMemory(

reinterpret_cast<const unsigned char*>(data_ptr), data_size));

if (!memory)

« no previous file with comments | « ui/base/resource/resource_bundle_win.cc ('k') | webkit/support/platform_support_win.cc » ('j') | no next file with comments »