Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1509)

Unified Diff: chrome/browser/web_applications/web_app_win.cc

Issue 13620002: Fix shortcut name slicing for v2 apps on windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/web_applications/web_app_win.cc
diff --git a/chrome/browser/web_applications/web_app_win.cc b/chrome/browser/web_applications/web_app_win.cc
index a547545aebd1cf5a5b015c9bf46f6d4a126fb163..4b543f1dc210dcd330cf6104d8e825b39c651459 100644
--- a/chrome/browser/web_applications/web_app_win.cc
+++ b/chrome/browser/web_applications/web_app_win.cc
@@ -147,7 +147,7 @@ std::vector<base::FilePath> MatchingShortcutsForProfileAndExtension(
std::vector<base::FilePath> shortcut_paths;
base::FilePath base_path = shortcut_path.
Append(web_app::internals::GetSanitizedFileName(shortcut_name)).
- ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
+ AddExtension(FILE_PATH_LITERAL(".lnk"));
const int fileNamesToCheck = 10;
for (int i = 0; i < fileNamesToCheck; ++i) {
@@ -234,7 +234,7 @@ bool CreatePlatformShortcuts(
web_app::internals::GetSanitizedFileName(shortcut_info.title);
// Creates an ico file to use with shortcut.
- base::FilePath icon_file = web_app_path.Append(file_name).ReplaceExtension(
+ base::FilePath icon_file = web_app_path.Append(file_name).AddExtension(
FILE_PATH_LITERAL(".ico"));
if (!web_app::internals::CheckAndSaveIcon(icon_file,
*shortcut_info.favicon.ToSkBitmap())) {
@@ -270,7 +270,7 @@ bool CreatePlatformShortcuts(
bool success = true;
for (size_t i = 0; i < shortcut_paths.size(); ++i) {
base::FilePath shortcut_file = shortcut_paths[i].Append(file_name).
- ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
+ AddExtension(FILE_PATH_LITERAL(".lnk"));
if (shortcut_paths[i] != web_app_path) {
int unique_number =
file_util::GetUniquePathNumber(shortcut_file, FILE_PATH_LITERAL(""));
@@ -299,7 +299,7 @@ bool CreatePlatformShortcuts(
// Use the web app path shortcut for pinning to avoid having unique numbers
// in the application name.
base::FilePath shortcut_to_pin = web_app_path.Append(file_name).
- ReplaceExtension(FILE_PATH_LITERAL(".lnk"));
+ AddExtension(FILE_PATH_LITERAL(".lnk"));
success = base::win::TaskbarPinShortcutLink(
shortcut_to_pin.value().c_str()) && success;
}
@@ -316,7 +316,7 @@ void UpdatePlatformShortcuts(
// If an icon file exists, and is out of date, replace it with the new icon
// and let the shell know the icon has been modified.
- base::FilePath icon_file = web_app_path.Append(file_name).ReplaceExtension(
+ base::FilePath icon_file = web_app_path.Append(file_name).AddExtension(
FILE_PATH_LITERAL(".ico"));
if (file_util::PathExists(icon_file)) {
web_app::internals::CheckAndSaveIcon(icon_file,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698