chrome/browser/ui/webui/extensions/extension_icon_source.cc - Issue 9320059: Define FilePath::NormalizePathSeparators on all platforms

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/webui/extensions/extension_icon_source.cc

Issue 9320059: Define FilePath::NormalizePathSeparators on all platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: build fix Created 8 years, 10 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: chrome/browser/ui/webui/extensions/extension_icon_source.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc

index ddc6ee10a64ef890ac95e1bb137316bf23c588c4..3ba06f5fa26be852a07cf977f8a980394cdb0141 100644

--- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc

+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc

@@ -210,9 +210,7 @@ bool ExtensionIconSource::TryLoadingComponentExtensionImage(

for (size_t i = 0; i < kComponentExtensionResourcesSize; ++i) {

FilePath bm_resource_path =

FilePath().AppendASCII(kComponentExtensionResources[i].name);

-#if defined(OS_WIN)

- bm_resource_path = bm_resource_path.NormalizeWindowsPathSeparators();

-#endif

+ bm_resource_path = bm_resource_path.NormalizePathSeparators();

if (relative_path == bm_resource_path) {

scoped_ptr<SkBitmap> decoded(LoadImageByResourceId(

kComponentExtensionResources[i].value));