diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 10:28:13 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 10:28:13 +0000 |
| commit | 49258236bb5fb4869f30d148443b36962d3b56a7 (patch) | |
| tree | 8a00baf1da0a4c902fb3722dde3e02c925089321 | |
| parent | 9e04d686c95373ed4bab59fd9eb9c73b169ba959 (diff) | |
| download | chromium_src-49258236bb5fb4869f30d148443b36962d3b56a7.zip chromium_src-49258236bb5fb4869f30d148443b36962d3b56a7.tar.gz chromium_src-49258236bb5fb4869f30d148443b36962d3b56a7.tar.bz2 | |
Files.app: Update the "cannot open file" error string for .exe files.
BUG=249521
TEST=manual
R=hirono@chromium.org
Review URL: https://codereview.chromium.org/17572007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208189 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/file_manager/js/file_tasks.js | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 14ea2e8..24d90e0 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -13104,6 +13104,10 @@ Some features may be unavailable. Please check that the profile exists and you This file type is not supported. Please visit the <ph name="BEGIN_LINK"><a target='_blank' href='$1'><ex><a target='_blank' href='$1'></ex></ph>Chrome Web Store<ph name="END_LINK"></a><ex></a></ex></ph> to find an app that can open this type of file. <ph name="BEGIN_LINK_HELP"><a target='_blank' href='$2'><ex><a target='_blank' href='$2'></ex></ph>Learn More<ph name="END_LINK_HELP"></a><ex></a></ex></ph> </message> + <message name="IDS_FILE_BROWSER_NO_ACTION_FOR_EXECUTABLE" desc="Message shown when user tries to open a windows executable file, which we can't handle."> + This file type is not supported. Please visit the <ph name="BEGIN_LINK"><a target='_blank' href='$1'><ex><a target='_blank' href='$1'></ex></ph>Chrome Web Store<ph name="END_LINK"></a><ex></a></ex></ph> to find a similar app. + <ph name="BEGIN_LINK_HELP"><a target='_blank' href='$2'><ex><a target='_blank' href='$2'></ex></ph>Learn More<ph name="END_LINK_HELP"></a><ex></a></ex></ph> + </message> <message name="IDS_FILE_BROWSER_ID3_ALBUM" desc="Album"> Album </message> diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc index e8928c8..3660bb5 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc @@ -2115,6 +2115,8 @@ bool FileDialogStringsFunction::RunImpl() { SET_STRING("DRIVE_WELCOME_CHECK_ELIGIBILITY", IDS_FILE_BROWSER_DRIVE_WELCOME_CHECK_ELIGIBILITY); SET_STRING("NO_ACTION_FOR_FILE", IDS_FILE_BROWSER_NO_ACTION_FOR_FILE); + SET_STRING("NO_ACTION_FOR_EXECUTABLE", + IDS_FILE_BROWSER_NO_ACTION_FOR_EXECUTABLE); // MP3 metadata extractor plugin SET_STRING("ID3_ALBUM", IDS_FILE_BROWSER_ID3_ALBUM); // TALB diff --git a/chrome/browser/resources/file_manager/js/file_tasks.js b/chrome/browser/resources/file_manager/js/file_tasks.js index 988e50c..329b29b 100644 --- a/chrome/browser/resources/file_manager/js/file_tasks.js +++ b/chrome/browser/resources/file_manager/js/file_tasks.js @@ -274,8 +274,10 @@ FileTasks.prototype.executeDefaultInternal_ = function(urls) { if (props && props[0] && props[0].contentMimeType) mimeType = props[0].contentMimeType; + var messageString = extension == 'exe' ? 'NO_ACTION_FOR_EXECUTABLE' : + 'NO_ACTION_FOR_FILE'; var webStoreUrl = FileTasks.createWebStoreLink(extension, mimeType); - var text = loadTimeData.getStringF('NO_ACTION_FOR_FILE', + var text = loadTimeData.getStringF(messageString, webStoreUrl, FileTasks.NO_ACTION_FOR_FILE_URL); this.fileManager_.alert.showHtml(filename, text, function() {}); |