Always show file extensions in the shelf.

BUG=1208

Review URL: http://codereview.chromium.org/8991

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4450 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 2 deletions

diff --git a/base/file_util.cc b/base/file_util.cc
index ade8db1..dd00d00 100644
--- a/base/file_util.cc
+++ b/base/file_util.cc
@@ -90,13 +90,21 @@ std::wstring GetFilenameFromPath(const std::wstring& path) {
   // TODO(erikkay): fix this - it's not using kPathSeparator, but win unit test
   // are exercising '/' as a path separator as well.
   std::wstring::size_type pos = path.find_last_of(L"\\/");
-  return std::wstring(path, pos == std::wstring::npos ? 0 : pos+1);
+  return std::wstring(path, pos == std::wstring::npos ? 0 : pos + 1);
 }
 
 std::wstring GetFileExtensionFromPath(const std::wstring& path) {
   std::wstring file_name = GetFilenameFromPath(path);
   std::wstring::size_type last_dot = file_name.rfind(L'.');
-  return std::wstring(last_dot == std::wstring::npos? L"" : file_name, last_dot+1);
+  return std::wstring(last_dot == std::wstring::npos ? 
+      L"" : 
+      file_name, last_dot+1);
+}
+
+std::wstring GetFilenameWithoutExtensionFromPath(const std::wstring& path) {
+  std::wstring file_name = GetFilenameFromPath(path);
+  std::wstring::size_type last_dot = file_name.rfind(L'.');
+  return file_name.substr(0, last_dot);
 }
 
 void AppendToPath(std::wstring* path, const std::wstring& new_ending) {
diff --git a/base/file_util.h b/base/file_util.h
index 6126c105..127afd0 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -69,6 +69,9 @@ std::wstring GetFilenameFromPath(const std::wstring& path);
 // the file has no extension.
 std::wstring GetFileExtensionFromPath(const std::wstring& path);
 
+// Returns 'jojo' for path "C:\pics\jojo.jpg".
+std::wstring GetFilenameWithoutExtensionFromPath(const std::wstring& path);
+
 // Returns the directory component of a path, without the trailing
 // path separator, or an empty string on error. The function does not
 // check for the existence of the path, so if it is passed a directory