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

Side by Side Diff: chrome/browser/extensions/pack_extension_job.cc

Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/pack_extension_job.h" 5 #include "chrome/browser/extensions/pack_extension_job.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "base/task.h" 10 #include "base/task.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 76 }
77 77
78 void PackExtensionJob::ReportFailureOnClientThread(const std::string& error) { 78 void PackExtensionJob::ReportFailureOnClientThread(const std::string& error) {
79 if (client_) 79 if (client_)
80 client_->OnPackFailure(error); 80 client_->OnPackFailure(error);
81 } 81 }
82 82
83 // static 83 // static
84 string16 PackExtensionJob::StandardSuccessMessage(const FilePath& crx_file, 84 string16 PackExtensionJob::StandardSuccessMessage(const FilePath& crx_file,
85 const FilePath& key_file) { 85 const FilePath& key_file) {
86 string16 crx_file_string = WideToUTF16(crx_file.ToWStringHack()); 86 string16 crx_file_string = crx_file.LossyDisplayName();
87 string16 key_file_string = WideToUTF16(key_file.ToWStringHack()); 87 string16 key_file_string = key_file.LossyDisplayName();
88 if (key_file_string.empty()) { 88 if (key_file_string.empty()) {
89 return l10n_util::GetStringFUTF16( 89 return l10n_util::GetStringFUTF16(
90 IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_UPDATE, 90 IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_UPDATE,
91 crx_file_string); 91 crx_file_string);
92 } else { 92 } else {
93 return l10n_util::GetStringFUTF16( 93 return l10n_util::GetStringFUTF16(
94 IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_NEW, 94 IDS_EXTENSION_PACK_DIALOG_SUCCESS_BODY_NEW,
95 crx_file_string, 95 crx_file_string,
96 key_file_string); 96 key_file_string);
97 } 97 }
98 } 98 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698