chrome/browser/web_applications/web_app.cc - Issue 9316004: Move common file path related methods between chrome & content to file_util. I reduced the 4 meth...

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/web_applications/web_app.cc

Issue 9316004: Move common file path related methods between chrome & content to file_util. I reduced the 4 meth... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: remove includes Created 8 years, 11 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

Index: chrome/browser/web_applications/web_app.cc

===================================================================

--- chrome/browser/web_applications/web_app.cc (revision 119906)

+++ chrome/browser/web_applications/web_app.cc (working copy)

@@ -14,6 +14,7 @@

#include "base/i18n/file_util_icu.h"

#include "base/md5.h"

#include "base/path_service.h"

+#include "base/stringprintf.h"

#include "base/string_util.h"

#include "base/threading/thread.h"

#include "base/utf_string_conversions.h"

@@ -290,12 +291,14 @@

FilePath shortcut_file = shortcut_paths[i].Append(file_name).

ReplaceExtension(FILE_PATH_LITERAL(".lnk"));

- int unique_number = DownloadFile::GetUniquePathNumber(shortcut_file);

+ int unique_number =

+ file_util::GetUniquePathNumber(shortcut_file, FILE_PATH_LITERAL(""));

if (unique_number == -1) {

success = false;

continue;

} else if (unique_number > 0) {

- DownloadFile::AppendNumberToPath(&shortcut_file, unique_number);

+ shortcut_file = shortcut_file.InsertBeforeExtensionASCII(

+ StringPrintf(" (%d)", unique_number));

}

success &= file_util::CreateShortcutLink(chrome_exe.value().c_str(),

« no previous file with comments | « chrome/browser/extensions/webstore_installer.cc ('k') | content/browser/download/download_file.h » ('j') | no next file with comments »